[llvm-commits] CVS: llvm-poolalloc/include/poolalloc/PoolAllocate.h

[John Criswell]

Changes in directory llvm-poolalloc/include/poolalloc:

PoolAllocate.h updated: 1.51 -> 1.52
---
Log message:

Merged from release_19 branch.
This adds correct compilation of DSA, pool inference, and configure script
fixes to mainline.



---
Diffs of the changes:  (+3 -4)

 PoolAllocate.h |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


Index: llvm-poolalloc/include/poolalloc/PoolAllocate.h
diff -u llvm-poolalloc/include/poolalloc/PoolAllocate.h:1.51 llvm-poolalloc/include/poolalloc/PoolAllocate.h:1.52
--- llvm-poolalloc/include/poolalloc/PoolAllocate.h:1.51	Wed Jul 26 10:37:25 2006
+++ llvm-poolalloc/include/poolalloc/PoolAllocate.h	Wed Dec 13 23:51:06 2006
@@ -16,19 +16,18 @@
 
 #ifndef POOLALLOCATE_H
 #define POOLALLOCATE_H
-//#define SAFECODE 1
-//#define BOUNDS_CHECK 1
-//comment the above two for normal poolallocation
+
 #include "llvm/Pass.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/ADT/EquivalenceClasses.h"
 #include "llvm/ADT/VectorExtras.h"
 #include "llvm/ADT/hash_set"
+#include "poolalloc/Config/config.h"
 
 #ifdef SAFECODE
 //FIXME : make this use some configuration options
-#include "/home/vadve/dhurjati/llvm/projects/safecode.typesafe/include/ConvertUnsafeAllocas.h"
+#include "/home/vadve/criswell/src/latestllvm/projects/safecode/include/ConvertUnsafeAllocas.h"
 #endif