From 92d9cb4dd1fcf633e264cbacbcdcd1b5c6f10714 Mon Sep 17 00:00:00 2001 From: Michael Gottesman Date: Fri, 30 Aug 2013 22:09:03 +0000 Subject: Revert "cpp11-migrate: Fixing autoconf build after adding libclangReplace dependency" Revert "cpp11-migrate: Refactor for driver model of operation" This reverts commit r189691. This reverts commit r189689. This was breaking the phase 1 OS X build for ~2 hours. https://smooshbase.apple.com/buildbot-internal/builders/phase1%20-%20sanity/builds/9559 I reverted the latter commit since I think the latter depended on the former. llvm-svn: 189700 --- clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.cpp') diff --git a/clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.cpp b/clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.cpp index bd2eb63044f..7315768f360 100644 --- a/clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.cpp +++ b/clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.cpp @@ -30,7 +30,9 @@ public: if (!SyntaxOnlyAction::BeginSourceFileAction(CI, Filename)) return false; - Overrides.applyOverrides(CI.getSourceManager()); + FileOverrides::const_iterator I = Overrides.find(Filename); + if (I != Overrides.end()) + I->second->applyOverrides(CI.getSourceManager()); return true; } -- cgit v1.2.3