From 8e4018e2de52c534405d7155c7009d0b35afb861 Mon Sep 17 00:00:00 2001
From: Cedric Venet <cedric.venet@laposte.net>
Date: Sat, 20 Sep 2008 18:02:18 +0000
Subject: [PATCH] Update VS projects. Change some class to struct for
 coherency.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56389 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/CodeGen/MachineBasicBlock.h |  5 +++--
 include/llvm/CodeGen/MachineFunction.h   |  2 +-
 include/llvm/CodeGen/SelectionDAG.h      |  3 ++-
 include/llvm/CodeGen/SelectionDAGNodes.h |  4 ++--
 win32/CodeGen/CodeGen.vcproj             | 10 +++++++++-
 win32/Transforms/Transforms.vcproj       |  6 +++++-
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h
index 8ee75c9c9fd..b47108a8627 100644
--- a/include/llvm/CodeGen/MachineBasicBlock.h
+++ b/include/llvm/CodeGen/MachineBasicBlock.h
@@ -24,7 +24,8 @@ class BasicBlock;
 class MachineFunction;
 
 template <>
-class ilist_traits<MachineInstr> : public ilist_default_traits<MachineInstr> {
+struct ilist_traits<MachineInstr> : public ilist_default_traits<MachineInstr> {
+private:
   mutable MachineInstr Sentinel;
 
   // this is only set by the MachineBasicBlock owning the LiveList
@@ -70,7 +71,7 @@ class MachineBasicBlock : public ilist_node<MachineBasicBlock> {
   bool IsLandingPad;
 
   // Intrusive list support
-  friend class ilist_sentinel_traits<MachineBasicBlock>;
+  friend struct ilist_sentinel_traits<MachineBasicBlock>;
   MachineBasicBlock() {}
 
   explicit MachineBasicBlock(MachineFunction &mf, const BasicBlock *bb);
diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h
index 7b24600b497..835c8a37c56 100644
--- a/include/llvm/CodeGen/MachineFunction.h
+++ b/include/llvm/CodeGen/MachineFunction.h
@@ -34,7 +34,7 @@ class MachineConstantPool;
 class MachineJumpTableInfo;
 
 template <>
-class ilist_traits<MachineBasicBlock>
+struct ilist_traits<MachineBasicBlock>
     : public ilist_default_traits<MachineBasicBlock> {
   mutable MachineBasicBlock Sentinel;
 public:
diff --git a/include/llvm/CodeGen/SelectionDAG.h b/include/llvm/CodeGen/SelectionDAG.h
index 15d0edc3d8a..95c30c6219a 100644
--- a/include/llvm/CodeGen/SelectionDAG.h
+++ b/include/llvm/CodeGen/SelectionDAG.h
@@ -36,7 +36,8 @@ class MachineFunction;
 class MachineConstantPoolValue;
 class FunctionLoweringInfo;
 
-template<> class ilist_traits<SDNode> : public ilist_default_traits<SDNode> {
+template<> struct ilist_traits<SDNode> : public ilist_default_traits<SDNode> {
+private:
   mutable SDNode Sentinel;
 public:
   ilist_traits() : Sentinel(ISD::DELETED_NODE, SDVTList()) {}
diff --git a/include/llvm/CodeGen/SelectionDAGNodes.h b/include/llvm/CodeGen/SelectionDAGNodes.h
index 2828bf00ab7..04686693622 100644
--- a/include/llvm/CodeGen/SelectionDAGNodes.h
+++ b/include/llvm/CodeGen/SelectionDAGNodes.h
@@ -43,7 +43,7 @@ class SDNode;
 class CompileUnitDesc;
 template <typename T> struct DenseMapInfo;
 template <typename T> struct simplify_type;
-template <typename T> class ilist_traits;
+template <typename T> struct ilist_traits;
 
 /// SDVTList - This represents a list of ValueType's that has been intern'd by
 /// a SelectionDAG.  Instances of this simple value class are returned by
@@ -1315,7 +1315,7 @@ public:
 
 protected:
   friend class SelectionDAG;
-  friend class ilist_traits<SDNode>;
+  friend struct ilist_traits<SDNode>;
   
   /// getValueTypeList - Return a pointer to the specified value type.
   ///
diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index 89132ff5e14..b5b755f289a 100644
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="CodeGen"
 	ProjectGUID="{08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}"
 	Keyword="Win32Proj"
@@ -308,6 +308,10 @@
 				RelativePath="..\..\lib\CodeGen\BranchFolding.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\lib\CodeGen\DeadMachineInstructionElim.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\lib\CodeGen\ELFWriter.cpp"
 				>
@@ -539,6 +543,10 @@
 					RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGEmit.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGFast.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGList.cpp"
 					>
diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj
index 47383ddbb2c..4b0926df032 100644
--- a/win32/Transforms/Transforms.vcproj
+++ b/win32/Transforms/Transforms.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="Transforms"
 	ProjectGUID="{C59374C1-9FC0-4147-B836-327DFDC52D99}"
 	Keyword="Win32Proj"
@@ -335,6 +335,10 @@
 			<Filter
 				Name="IPO"
 				>
+				<File
+					RelativePath="..\..\lib\Transforms\IPO\AddReadAttrs.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Ipo\ArgumentPromotion.cpp"
 					>