[llvm-commits] [poolalloc] r68226 - in /poolalloc/trunk: include/dsa/DSGraph.h include/dsa/DSNode.h include/dsa/DSSupport.h include/dsa/DataStructure.h include/poolalloc/PoolAllocate.h lib/DSA/DataStructure.cpp

[John Criswell]

Author: criswell
Date: Wed Apr  1 13:33:36 2009
New Revision: 68226

URL: http://llvm.org/viewvc/llvm-project?rev=68226&view=rev
Log:
Modified code to use its own header files to use the hash_set and hash_map
containers.  LLVM removed support for these last month.

Modified:
    poolalloc/trunk/include/dsa/DSGraph.h
    poolalloc/trunk/include/dsa/DSNode.h
    poolalloc/trunk/include/dsa/DSSupport.h
    poolalloc/trunk/include/dsa/DataStructure.h
    poolalloc/trunk/include/poolalloc/PoolAllocate.h
    poolalloc/trunk/lib/DSA/DataStructure.cpp

Modified: poolalloc/trunk/include/dsa/DSGraph.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSGraph.h?rev=68226&r1=68225&r2=68226&view=diff

==============================================================================
--- poolalloc/trunk/include/dsa/DSGraph.h (original)
+++ poolalloc/trunk/include/dsa/DSGraph.h Wed Apr  1 13:33:36 2009
@@ -16,12 +16,15 @@
 #define LLVM_ANALYSIS_DSGRAPH_H
 
 #include "dsa/DSNode.h"
-#include "llvm/ADT/hash_map.h"
 #include "llvm/ADT/EquivalenceClasses.h"
+#include "poolalloc/ADT/HashExtras.h"
 
+#include <ext/hash_map>
+#include <ext/hash_set>
 #include <list>
 #include <map>
 #include <iostream>
+
 namespace llvm {
 
 

Modified: poolalloc/trunk/include/dsa/DSNode.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSNode.h?rev=68226&r1=68225&r2=68226&view=diff

==============================================================================
--- poolalloc/trunk/include/dsa/DSNode.h (original)
+++ poolalloc/trunk/include/dsa/DSNode.h Wed Apr  1 13:33:36 2009
@@ -15,8 +15,8 @@
 #define LLVM_ANALYSIS_DSNODE_H
 
 #include "dsa/DSSupport.h"
-#include "llvm/ADT/hash_map.h"
 #include "llvm/Support/Streams.h"
+#include "poolalloc/ADT/HashExtras.h"
 
 namespace llvm {
 

Modified: poolalloc/trunk/include/dsa/DSSupport.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSSupport.h?rev=68226&r1=68225&r2=68226&view=diff

==============================================================================
--- poolalloc/trunk/include/dsa/DSSupport.h (original)
+++ poolalloc/trunk/include/dsa/DSSupport.h Wed Apr  1 13:33:36 2009
@@ -15,9 +15,8 @@
 #define LLVM_ANALYSIS_DSSUPPORT_H
 
 #include <functional>
-#include "llvm/ADT/hash_map.h"
-#include "llvm/ADT/hash_set.h"
 #include "llvm/Support/CallSite.h"
+#include "poolalloc/ADT/HashExtras.h"
 
 namespace llvm {
 
@@ -146,7 +145,7 @@
   inline void swap<llvm::DSNodeHandle>(llvm::DSNodeHandle &NH1, llvm::DSNodeHandle &NH2) { NH1.swap(NH2); }
 }
 
-namespace HASH_NAMESPACE {
+namespace __gnu_cxx {
   // Provide a hash function for arbitrary pointers...
   template <> struct hash<llvm::DSNodeHandle> {
     inline size_t operator()(const llvm::DSNodeHandle &Val) const {

Modified: poolalloc/trunk/include/dsa/DataStructure.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DataStructure.h?rev=68226&r1=68225&r2=68226&view=diff

==============================================================================
--- poolalloc/trunk/include/dsa/DataStructure.h (original)
+++ poolalloc/trunk/include/dsa/DataStructure.h Wed Apr  1 13:33:36 2009
@@ -17,10 +17,10 @@
 #include "llvm/Pass.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Support/CallSite.h"
-#include "llvm/ADT/hash_map.h"
-#include "llvm/ADT/hash_set.h"
 #include "llvm/ADT/EquivalenceClasses.h"
 
+#include "poolalloc/ADT/HashExtras.h"
+
 #include <map>
 
 namespace llvm {

Modified: poolalloc/trunk/include/poolalloc/PoolAllocate.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc/PoolAllocate.h?rev=68226&r1=68225&r2=68226&view=diff

==============================================================================
--- poolalloc/trunk/include/poolalloc/PoolAllocate.h (original)
+++ poolalloc/trunk/include/poolalloc/PoolAllocate.h Wed Apr  1 13:33:36 2009
@@ -25,9 +25,9 @@
 #include "llvm/Support/CallSite.h"
 #include "llvm/ADT/EquivalenceClasses.h"
 #include "llvm/ADT/VectorExtras.h"
-#include "llvm/ADT/hash_set.h"
 #include "llvm/Support/CommandLine.h"
 #include "dsa/DataStructure.h"
+#include "poolalloc/ADT/HashExtras.h"
 #include "poolalloc/Config/config.h"
 
 #include <set>

Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=68226&r1=68225&r2=68226&view=diff

==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructure.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructure.cpp Wed Apr  1 13:33:36 2009
@@ -30,7 +30,7 @@
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/ADT/hash_map.h"
+#include "poolalloc/ADT/HashExtras.h"
 
 #include <iostream>
 #include <algorithm>