| commit | e0c4d895ffe4320aa4e29485711ad7d154f2cc2b | [log] [tgz] |
|---|---|---|
| author | Steve Naroff <snaroff@apple.com> | Sat Dec 05 02:14:08 2009 +0000 |
| committer | Steve Naroff <snaroff@apple.com> | Sat Dec 05 02:14:08 2009 +0000 |
| tree | b071246127456df448adedb3216d056324ed5360 | |
| parent | 152b5b13260c4caa98f9ae959048fa9b25bc7f20 [diff] [blame] |
Integrate the following from the 'objective-rewrite' branch: http://llvm.org/viewvc/llvm-project?view=rev&revision=71086 Note - This commit only includes the fix for: <rdar://problem/6309338> slightly different error message format for Visual Studio. The fix for <rdar://problem/6845623> from protocol to template. is separate/forthcoming. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90642 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp index 8a0b858..1f51791 100644 --- a/lib/Basic/Diagnostic.cpp +++ b/lib/Basic/Diagnostic.cpp
@@ -210,7 +210,8 @@ ErrorOccurred = false; FatalErrorOccurred = false; NumDiagnostics = 0; - + LangOpts = 0; + NumErrors = 0; CustomDiagInfo = 0; CurDiagID = ~0U;