| OLD | NEW |
| 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 #include "tools/gn/import_manager.h" | 5 #include "tools/gn/import_manager.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
| 9 #include "tools/gn/parse_tree.h" | 9 #include "tools/gn/parse_tree.h" |
| 10 #include "tools/gn/scheduler.h" | 10 #include "tools/gn/scheduler.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 ImportMap::const_iterator found = imports_.find(file); | 74 ImportMap::const_iterator found = imports_.find(file); |
| 75 if (found != imports_.end()) { | 75 if (found != imports_.end()) { |
| 76 delete imported_scope; | 76 delete imported_scope; |
| 77 imported_scope = found->second; | 77 imported_scope = found->second; |
| 78 } else { | 78 } else { |
| 79 imports_[file] = imported_scope; | 79 imports_[file] = imported_scope; |
| 80 } | 80 } |
| 81 } | 81 } |
| 82 } | 82 } |
| 83 | 83 |
| 84 return imported_scope->NonRecursiveMergeTo(scope, node_for_err, | 84 return imported_scope->NonRecursiveMergeTo(scope, false, node_for_err, |
| 85 "import", err); | 85 "import", err); |
| 86 } | 86 } |
| OLD | NEW |