Move operator overload out of line. Calling operator<< on a forward declared type doesn't seem to work on MSVC.

llvm-svn: 149819

2 files changed, 7 insertions, 6 deletions

diff --git a/clang/include/clang/AST/CanonicalType.h b/clang/include/clang/AST/CanonicalType.h
index 99552b36171..5b27b4e1faf 100644
--- a/clang/include/clang/AST/CanonicalType.h
+++ b/clang/include/clang/AST/CanonicalType.h
@@ -16,7 +16,6 @@
 #define LLVM_CLANG_AST_CANONICAL_TYPE_H
 
 #include "clang/AST/Type.h"
-#include "clang/Basic/Diagnostic.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/type_traits.h"
 #include <iterator>
@@ -201,11 +200,7 @@ inline CanQualType Type::getCanonicalTypeUnqualified() const {
   return CanQualType::CreateUnsafe(getCanonicalTypeInternal());
 }
 
-inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB,
-                                           CanQualType T) {
-  DB << static_cast<QualType>(T);
-  return DB;
-}
+const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB, CanQualType T);
 
 //----------------------------------------------------------------------------//
 // Internal proxy classes used by canonical types
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index 1c5aa3194e7..be38ba66bc0 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -2324,3 +2324,9 @@ const PartialDiagnostic &clang::operator<<(const PartialDiagnostic &PD,
                   DiagnosticsEngine::ak_qualtype);
   return PD;
 }
+
+const DiagnosticBuilder &clang::operator<<(const DiagnosticBuilder &DB,
+                                           CanQualType T) {
+  DB << static_cast<QualType>(T);
+  return DB;
+}