Get lib/Analysis/DataStructure to compile with VC++

llvm-svn: 19412

6 files changed, 75 insertions, 2 deletions

diff --git a/llvm/include/llvm/Analysis/DataStructure/DSGraph.h b/llvm/include/llvm/Analysis/DataStructure/DSGraph.h
index 101b6547a02..5efdde9a69c 100644
--- a/llvm/include/llvm/Analysis/DataStructure/DSGraph.h
+++ b/llvm/include/llvm/Analysis/DataStructure/DSGraph.h
@@ -16,6 +16,7 @@
 #define LLVM_ANALYSIS_DSGRAPH_H
 
 #include "llvm/Analysis/DataStructure/DSNode.h"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 
@@ -97,7 +98,8 @@ public:
 //===----------------------------------------------------------------------===//
 /// DSGraph - The graph that represents a function.
 ///
-struct DSGraph {
+class DSGraph {
+public:
   // Public data-type declarations...
   typedef DSScalarMap ScalarMapTy;
   typedef hash_map<Function*, DSNodeHandle> ReturnNodesTy;
diff --git a/llvm/include/llvm/Analysis/DataStructure/DSNode.h b/llvm/include/llvm/Analysis/DataStructure/DSNode.h
index 3cdc0a6420e..8dc39fb73cb 100644
--- a/llvm/include/llvm/Analysis/DataStructure/DSNode.h
+++ b/llvm/include/llvm/Analysis/DataStructure/DSNode.h
@@ -15,6 +15,7 @@
 #define LLVM_ANALYSIS_DSNODE_H
 
 #include "llvm/Analysis/DataStructure/DSSupport.h"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/Analysis/DataStructure/DSSupport.h b/llvm/include/llvm/Analysis/DataStructure/DSSupport.h
index 6dbd36b4444..07fe159781c 100644
--- a/llvm/include/llvm/Analysis/DataStructure/DSSupport.h
+++ b/llvm/include/llvm/Analysis/DataStructure/DSSupport.h
@@ -15,6 +15,7 @@
 #define LLVM_ANALYSIS_DSSUPPORT_H
 
 #include <functional>
+#include "llvm/ADT/hash_map"
 #include "llvm/ADT/hash_set"
 #include "llvm/Support/CallSite.h"
 
diff --git a/llvm/include/llvm/Analysis/DataStructure/DataStructure.h b/llvm/include/llvm/Analysis/DataStructure/DataStructure.h
index 34575a2db8a..627c7c4d7b4 100644
--- a/llvm/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/llvm/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -16,6 +16,7 @@
 
 #include "llvm/Pass.h"
 #include "llvm/Target/TargetData.h"
+#include "llvm/ADT/hash_map"
 #include "llvm/ADT/hash_set"
 
 namespace llvm {
diff --git a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
index 51485dab891..9a65c488bff 100644
--- a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
+++ b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
@@ -49,7 +49,8 @@ namespace llvm {
 /// not copied over from one table to another since it is no longer useful.
 ///--------------------------------------------------------------------------
 
-struct ModRefTable {
+class ModRefTable {
+public:
   typedef hash_map<Instruction*, ModRefInfo> ModRefMap;
   typedef ModRefMap::const_iterator                 const_map_iterator;
   typedef ModRefMap::      iterator                       map_iterator;
diff --git a/llvm/win32/Analysis/Analysis.vcproj b/llvm/win32/Analysis/Analysis.vcproj
index 0b129f9d0ba..6293130ad5d 100644
--- a/llvm/win32/Analysis/Analysis.vcproj
+++ b/llvm/win32/Analysis/Analysis.vcproj
@@ -188,6 +188,73 @@
 					RelativePath="..\..\lib\Analysis\Ipa\PrintSCC.cpp">
 				</File>
 			</Filter>
+			<Filter
+				Name="DataStructure"
+				Filter="">
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\BottomUpClosure.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\CompleteBottomUp.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\DataStructure.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\DataStructureAA.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\DataStructureOpt.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\DataStructureStats.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\DependenceGraph.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\DependenceGraph.h">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\DSCallSiteIterator.h">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\GraphChecker.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\IPModRef.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\IPModRef.h">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\Local.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\MemoryDepAnalysis.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\MemoryDepAnalysis.h">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\Parallelize.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\PgmDependenceGraph.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\PgmDependenceGraph.h">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\Printer.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\Steensgaard.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\TopDownClosure.cpp">
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"