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

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

diff --git a/include/llvm/Analysis/DataStructure/DSGraph.h b/include/llvm/Analysis/DataStructure/DSGraph.h
index 101b6547a02821951b5fa0b7ee83bd84cddf4c29..5efdde9a69cf9df90a81c934af02e042f8a27a9c 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DSGraph.h
+++ b/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/include/llvm/Analysis/DataStructure/DSNode.h b/include/llvm/Analysis/DataStructure/DSNode.h
index 3cdc0a6420e6e7ab939866b73532deef72db6bf4..8dc39fb73cbf4b37825b753d0fc4e1ee583d71bd 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DSNode.h
+++ b/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/include/llvm/Analysis/DataStructure/DSSupport.h b/include/llvm/Analysis/DataStructure/DSSupport.h
index 6dbd36b4444d260914a829df2a7ef06d75315eed..07fe159781ceb179d44b2513b687b337f42b80ab 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DSSupport.h
+++ b/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/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index 34575a2db8ab075872620ac082c561dad10935ba..627c7c4d7b498f7b5562a299aaf33dfa742cea79 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/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/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
index 51485dab891f834063da7b05d0f213607725cc65..9a65c488bff4478b45175c355ec27dd8ffed053e 100644 (file)
--- a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
+++ b/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/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index 0b129f9d0bac37af7964d4fda307996b58c0b47b..6293130ad5df8a6df954245c4065d78744d21d46 100644 (file)
--- a/win32/Analysis/Analysis.vcproj
+++ b/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"