From 132715e1e82b1f69fc5a67d3acedb24c12d02e2a Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Mon, 4 Nov 2013 19:19:59 +0000 Subject: GN: toolchain threading cleanup Remove the thread-unsafe toolchain pointer on the otherwise-threadsafe Settings object. I replaced it with the toolchain label, and moved the is_default flag from the toolchain to the Settings object. This required that I pass the toolchain around in a few more places, but also simplifies some other cases. I removed the toolchain prefix from Ninja rules for the default toolchain since that's not necessary any more for GYP compat. This fixes an annoying double-free in the toolchain manager. I think my current refactor will clean this up in a later phase. R=scottmg@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=232657 Review URL: https://codereview.chromium.org/51693002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232755 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/gn/test_with_scope.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/gn/test_with_scope.h') diff --git a/tools/gn/test_with_scope.h b/tools/gn/test_with_scope.h index 7d512c4..df2c93e 100644 --- a/tools/gn/test_with_scope.h +++ b/tools/gn/test_with_scope.h @@ -20,12 +20,13 @@ class TestWithScope { BuildSettings* build_settings() { return &build_settings_; } Settings* settings() { return &settings_; } + Toolchain* toolchain() { return &toolchain_; } Scope* scope() { return &scope_; } private: BuildSettings build_settings_; - Toolchain toolchain_; Settings settings_; + Toolchain toolchain_; Scope scope_; DISALLOW_COPY_AND_ASSIGN(TestWithScope); -- cgit v1.1