From 7e17fe3191fb40360c88d28f1491aae203f0aa03 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Mon, 21 May 2018 15:10:52 +0200
Subject: stop using DEBUG macro name

This is too generic and llvm 6.0 defines DEBUG as follows:
 #define DEBUG(X) DEBUG_WITH_TYPE(DEBUG_TYPE, X)

This then results in various build failures where once the macro is
defined, once it is not.

So rename this generic macro to KLEE_ARRAY_DEBUG.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 include/klee/SolverStats.h        | 2 +-
 include/klee/util/ArrayExprHash.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/klee/SolverStats.h b/include/klee/SolverStats.h
index a38c9826..3f68b620 100644
--- a/include/klee/SolverStats.h
+++ b/include/klee/SolverStats.h
@@ -28,7 +28,7 @@ namespace stats {
   extern Statistic queryCounterexamples;
   extern Statistic queryTime;
   
-#ifdef DEBUG
+#ifdef KLEE_ARRAY_DEBUG
   extern Statistic arrayHashTime;
 #endif
 
diff --git a/include/klee/util/ArrayExprHash.h b/include/klee/util/ArrayExprHash.h
index 23211a70..7fcd8ffb 100644
--- a/include/klee/util/ArrayExprHash.h
+++ b/include/klee/util/ArrayExprHash.h
@@ -85,7 +85,7 @@ template<class T>
 bool ArrayExprHash<T>::lookupArrayExpr(const Array* array, T& exp) const {
   bool res = false;
   
-#ifdef DEBUG
+#ifdef KLEE_ARRAY_DEBUG
   TimerStatIncrementer t(stats::arrayHashTime);
 #endif
   
@@ -101,7 +101,7 @@ bool ArrayExprHash<T>::lookupArrayExpr(const Array* array, T& exp) const {
 template<class T>
 void ArrayExprHash<T>::hashArrayExpr(const Array* array, T& exp) {
   
-#ifdef DEBUG  
+#ifdef KLEE_ARRAY_DEBUG
    TimerStatIncrementer t(stats::arrayHashTime);
 #endif
    
@@ -114,7 +114,7 @@ bool ArrayExprHash<T>::lookupUpdateNodeExpr(const UpdateNode* un, T& exp) const
 {
   bool res = false;
   
-#ifdef DEBUG
+#ifdef KLEE_ARRAY_DEBUG
   TimerStatIncrementer t(stats::arrayHashTime);
 #endif
   
@@ -130,7 +130,7 @@ bool ArrayExprHash<T>::lookupUpdateNodeExpr(const UpdateNode* un, T& exp) const
 template<class T>
 void ArrayExprHash<T>::hashUpdateNodeExpr(const UpdateNode* un, T& exp) 
 {
-#ifdef DEBUG
+#ifdef KLEE_ARRAY_DEBUG
   TimerStatIncrementer t(stats::arrayHashTime);
 #endif
   
-- 
cgit 1.4.1