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>
---
 lib/Core/StatsTracker.cpp  | 4 ++--
 lib/Solver/SolverStats.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index d9ec35aa..f2a989e2 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -418,7 +418,7 @@ void StatsTracker::writeStatsHeader() {
              << "'ResolveTime',"
              << "'QueryCexCacheMisses',"
              << "'QueryCexCacheHits',"
-#ifdef DEBUG
+#ifdef KLEE_ARRAY_DEBUG
 	     << "'ArrayHashTime',"
 #endif
              << ")\n";
@@ -450,7 +450,7 @@ void StatsTracker::writeStatsLine() {
              << "," << stats::resolveTime / 1000000.
              << "," << stats::queryCexCacheMisses
              << "," << stats::queryCexCacheHits
-#ifdef DEBUG
+#ifdef KLEE_ARRAY_DEBUG
              << "," << stats::arrayHashTime / 1000000.
 #endif
              << ")\n";
diff --git a/lib/Solver/SolverStats.cpp b/lib/Solver/SolverStats.cpp
index 4b9c69c8..efdfe6ed 100644
--- a/lib/Solver/SolverStats.cpp
+++ b/lib/Solver/SolverStats.cpp
@@ -24,6 +24,6 @@ Statistic stats::queryConstructs("QueriesConstructs", "QB");
 Statistic stats::queryCounterexamples("QueriesCEX", "Qcex");
 Statistic stats::queryTime("QueryTime", "Qtime");
 
-#ifdef DEBUG
+#ifdef KLEE_ARRAY_DEBUG
 Statistic stats::arrayHashTime("ArrayHashTime", "AHtime");
 #endif
-- 
cgit 1.4.1