rename Assert.h/Assert.cpp to cvc4_assert.h/cvc4_assert.cpp -- we need to make it unambiguous for case-insensitive filesystems like on Mac. Fixes Mac builds

14 files changed, 15 insertions, 15 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index fcbadf490..1848ef764 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -20,8 +20,8 @@ libstatistics_la_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) -D__BUILDING_STATISTICS_F
 # configured at the time of the "make dist", which (1) may not be the
 # configuration that the user wants, and (2) might cause link errors.
 libutil_la_SOURCES = \
-	Assert.h \
-	Assert.cpp \
+	cvc4_assert.h \
+	cvc4_assert.cpp \
 	backtrackable.h \
 	Makefile.am \
 	Makefile.in \
diff --git a/src/util/boolean_simplification.h b/src/util/boolean_simplification.h
index a5a646231..fcdb11181 100644
--- a/src/util/boolean_simplification.h
+++ b/src/util/boolean_simplification.h
@@ -25,7 +25,7 @@
 #include <algorithm>
 
 #include "expr/node.h"
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 
 namespace CVC4 {
 
diff --git a/src/util/Assert.cpp b/src/util/cvc4_assert.cpp
index e299bef1d..ea70cc24e 100644
--- a/src/util/Assert.cpp
+++ b/src/util/cvc4_assert.cpp
@@ -20,7 +20,7 @@
 #include <cstdarg>
 #include <cstdio>
 
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 
 using namespace std;
 
diff --git a/src/util/Assert.h b/src/util/cvc4_assert.h
index 4a6fe4d3a..4a6fe4d3a 100644
--- a/src/util/Assert.h
+++ b/src/util/cvc4_assert.h
diff --git a/src/util/Assert.i b/src/util/cvc4_assert.i
index b43c36520..45d76312d 100644
--- a/src/util/Assert.i
+++ b/src/util/cvc4_assert.i
@@ -1,8 +1,8 @@
 %{
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 %}
 
 %rename(CVC4IllegalArgumentException) CVC4::IllegalArgumentException;
 %ignore CVC4::InternalErrorException::InternalErrorException(const char*, const char*, unsigned, const char*, ...);
 
-%include "util/Assert.h"
+%include "util/cvc4_assert.h"
diff --git a/src/util/datatype.cpp b/src/util/datatype.cpp
index ee9c4e406..a5be71da2 100644
--- a/src/util/datatype.cpp
+++ b/src/util/datatype.cpp
@@ -28,7 +28,7 @@
 #include "expr/node.h"
 #include "util/recursion_breaker.h"
 #include "util/matcher.h"
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 
 using namespace std;
 
diff --git a/src/util/dynamic_array.h b/src/util/dynamic_array.h
index 2c8b842e4..9f1fed565 100644
--- a/src/util/dynamic_array.h
+++ b/src/util/dynamic_array.h
@@ -22,7 +22,7 @@
 #ifndef __CVC4__UTIL__DYNAMIC_ARRAY_H
 #define __CVC4__UTIL__DYNAMIC_ARRAY_H
 
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 
 namespace CVC4 {
 
diff --git a/src/util/exception.h b/src/util/exception.h
index 4241fb1f1..184a21453 100644
--- a/src/util/exception.h
+++ b/src/util/exception.h
@@ -131,7 +131,7 @@ inline std::ostream& operator<<(std::ostream& os, const Exception& e) throw() {
 }/* CVC4 namespace */
 
 #if (defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST)) && !defined(__BUILDING_STATISTICS_FOR_EXPORT)
-#  include "util/Assert.h"
+#  include "util/cvc4_assert.h"
 #endif /* (__BUILDING_CVC4LIB || __BUILDING_CVC4LIB_UNIT_TEST) && !__BUILDING_STATISTICS_FOR_EXPORT */
 
 namespace CVC4 {
diff --git a/src/util/matcher.h b/src/util/matcher.h
index 871fe528f..abee47c9a 100644
--- a/src/util/matcher.h
+++ b/src/util/matcher.h
@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 #include <map>
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 #include "expr/node.h"
 #include "expr/type_node.h"
 
diff --git a/src/util/predicate.cpp b/src/util/predicate.cpp
index 748e818c3..5805e5c66 100644
--- a/src/util/predicate.cpp
+++ b/src/util/predicate.cpp
@@ -20,7 +20,7 @@
 
 #include "expr/expr.h"
 #include "util/predicate.h"
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 
 using namespace std;
 
diff --git a/src/util/recursion_breaker.h b/src/util/recursion_breaker.h
index 1146a4429..fe849842f 100644
--- a/src/util/recursion_breaker.h
+++ b/src/util/recursion_breaker.h
@@ -77,7 +77,7 @@
 #include <ext/hash_set>
 #include "util/hash.h"
 #include "util/tls.h"
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 
 namespace CVC4 {
 
diff --git a/src/util/result.cpp b/src/util/result.cpp
index 84e422c19..63d1ff843 100644
--- a/src/util/result.cpp
+++ b/src/util/result.cpp
@@ -22,7 +22,7 @@
 #include <cctype>
 
 #include "util/result.h"
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 #include "printer/printer.h"
 
 using namespace std;
diff --git a/src/util/sexpr.cpp b/src/util/sexpr.cpp
index f90426fab..a5034a36c 100644
--- a/src/util/sexpr.cpp
+++ b/src/util/sexpr.cpp
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "util/sexpr.h"
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 #include "printer/printer.h"
 #include "expr/expr.h"
 
diff --git a/src/util/trans_closure.cpp b/src/util/trans_closure.cpp
index ba289080c..7a70807aa 100644
--- a/src/util/trans_closure.cpp
+++ b/src/util/trans_closure.cpp
@@ -18,7 +18,7 @@
 
 
 #include "util/trans_closure.h"
-#include "util/Assert.h"
+#include "util/cvc4_assert.h"
 
 
 using namespace std;