Updated VC++ build system.

Silenced some VC++ warnings.
Had to rephrase a partial specialization of the IntrospectionTrait struct in SerializationTest.cpp, please review.
Added a compiler specific workaround in IdentifierTable.h. Is that the way to fix this kind of issues?


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43074 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 9 insertions, 1 deletions

diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index 25a6b94e72..e94d50519f 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -23,7 +23,7 @@
 
 
 namespace llvm {
-  template<typename T> class IntrospectionTrait;
+  template <typename T> struct IntrospectionTrait;
   template <typename T> struct DenseMapInfo;
 }
 
@@ -140,7 +140,11 @@ public:
   void setFETokenInfo(void *T) { FETokenInfo = T; }
   
   // For serialization and profiling.
+#if defined(_MSC_VER) && _MSC_VER <= 1400   // workaround for VC++ upto V8.0
+  template<typename T> friend class /*llvm::*/IntrospectionTrait;
+#else
   template<typename T> friend class llvm::IntrospectionTrait;
+#endif
 };
 
 /// IdentifierTable - This table implements an efficient mapping from strings to
@@ -183,7 +187,11 @@ public:
   void PrintStats() const;
   
   // For serialization and profiling.
+#if defined(_MSC_VER) && _MSC_VER <= 1400   // workaround for VC++ upto V8.0
+  template<typename T> friend class /*llvm::*/IntrospectionTrait;
+#else
   template<typename T> friend class llvm::IntrospectionTrait;
+#endif
 private:
   void AddKeywords(const LangOptions &LangOpts);
 };