r208514 - Revert "Revert "Another try at making MSVC happy again.""

[Alp Toker]

Author: alp
Date: Sun May 11 18:06:26 2014
New Revision: 208514

URL: http://llvm.org/viewvc/llvm-project?rev=208514&view=rev
Log:
Revert "Revert "Another try at making MSVC happy again.""

This didn't work out either.

Discussion at:
  http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20140505/105302.html

This reverts commit r208513.

Modified:
    cfe/trunk/include/clang/Basic/Diagnostic.h

Modified: cfe/trunk/include/clang/Basic/Diagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Diagnostic.h?rev=208514&r1=208513&r2=208514&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Diagnostic.h (original)
+++ cfe/trunk/include/clang/Basic/Diagnostic.h Sun May 11 18:06:26 2014
@@ -16,6 +16,7 @@
 #define LLVM_CLANG_DIAGNOSTIC_H
 
 #include "clang/Basic/DiagnosticIDs.h"
+#include "clang/Basic/DiagnosticOptions.h"
 #include "clang/Basic/SourceLocation.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
@@ -32,7 +33,6 @@ namespace clang {
   class DiagnosticOptions;
   class IdentifierInfo;
   class LangOptions;
-  enum OverloadsShown : unsigned;
   class Preprocessor;
   class StoredDiagnostic;
   namespace tok {