Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: tools/gn/loader.h

Issue 1878353002: GN: Use std::unique_ptr in Loader::ToolchainRecordMap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unnecessary WrapUnique Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | tools/gn/loader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef TOOLS_GN_LOADER_H_ 5 #ifndef TOOLS_GN_LOADER_H_
6 #define TOOLS_GN_LOADER_H_ 6 #define TOOLS_GN_LOADER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 #include <set> 10 #include <set>
10 11
11 #include "base/callback.h" 12 #include "base/callback.h"
12 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
13 #include "tools/gn/label.h" 14 #include "tools/gn/label.h"
14 #include "tools/gn/scope.h" 15 #include "tools/gn/scope.h"
15 16
16 namespace base { 17 namespace base {
17 class MessageLoop; 18 class MessageLoop;
18 } 19 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 // mocking purposes. 167 // mocking purposes.
167 AsyncLoadFileCallback async_load_file_; 168 AsyncLoadFileCallback async_load_file_;
168 169
169 typedef std::set<LoadID> LoadIDSet; 170 typedef std::set<LoadID> LoadIDSet;
170 LoadIDSet invocations_; 171 LoadIDSet invocations_;
171 172
172 const BuildSettings* build_settings_; 173 const BuildSettings* build_settings_;
173 Label default_toolchain_label_; 174 Label default_toolchain_label_;
174 175
175 // Records for the build config file loads. 176 // Records for the build config file loads.
176 // Owning pointers. 177 typedef std::map<Label, std::unique_ptr<ToolchainRecord>> ToolchainRecordMap;
177 typedef std::map<Label, ToolchainRecord*> ToolchainRecordMap;
178 ToolchainRecordMap toolchain_records_; 178 ToolchainRecordMap toolchain_records_;
179 }; 179 };
180 180
181 #endif // TOOLS_GN_LOADER_H_ 181 #endif // TOOLS_GN_LOADER_H_
OLDNEW
« no previous file with comments | « no previous file | tools/gn/loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698