Do not use __ prefix for header guards. (#2974)

Fixes 2887.

13 files changed, 39 insertions, 39 deletions

diff --git a/src/context/backtrackable.h b/src/context/backtrackable.h
index 31cbee2b1..5d358941f 100644
--- a/src/context/backtrackable.h
+++ b/src/context/backtrackable.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UTIL__BACKTRACKABLE_H
-#define __CVC4__UTIL__BACKTRACKABLE_H
+#ifndef CVC4__UTIL__BACKTRACKABLE_H
+#define CVC4__UTIL__BACKTRACKABLE_H
 
 #include <cstdlib>
 #include <vector>
@@ -219,4 +219,4 @@ template <class T> void Backtracker<T>::checkConsistency() {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UTIL__BACKTRACKABLE_H */
+#endif /* CVC4__UTIL__BACKTRACKABLE_H */
diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h
index 8d97bfa66..0a1f3387c 100644
--- a/src/context/cdhashmap.h
+++ b/src/context/cdhashmap.h
@@ -79,8 +79,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONTEXT__CDHASHMAP_H
-#define __CVC4__CONTEXT__CDHASHMAP_H
+#ifndef CVC4__CONTEXT__CDHASHMAP_H
+#define CVC4__CONTEXT__CDHASHMAP_H
 
 #include <functional>
 #include <iterator>
@@ -448,4 +448,4 @@ public:
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CDHASHMAP_H */
+#endif /* CVC4__CONTEXT__CDHASHMAP_H */
diff --git a/src/context/cdhashmap_forward.h b/src/context/cdhashmap_forward.h
index a98bbe649..667e71990 100644
--- a/src/context/cdhashmap_forward.h
+++ b/src/context/cdhashmap_forward.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__CONTEXT__CDHASHMAP_FORWARD_H
-#define __CVC4__CONTEXT__CDHASHMAP_FORWARD_H
+#ifndef CVC4__CONTEXT__CDHASHMAP_FORWARD_H
+#define CVC4__CONTEXT__CDHASHMAP_FORWARD_H
 
 #include <functional>
 
@@ -40,4 +40,4 @@ namespace CVC4 {
 
 /// \endcond
 
-#endif /* __CVC4__CONTEXT__CDHASHMAP_FORWARD_H */
+#endif /* CVC4__CONTEXT__CDHASHMAP_FORWARD_H */
diff --git a/src/context/cdhashset.h b/src/context/cdhashset.h
index 191ac1ac7..a35ecae88 100644
--- a/src/context/cdhashset.h
+++ b/src/context/cdhashset.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONTEXT__CDHASHSET_H
-#define __CVC4__CONTEXT__CDHASHSET_H
+#ifndef CVC4__CONTEXT__CDHASHSET_H
+#define CVC4__CONTEXT__CDHASHSET_H
 
 #include "base/cvc4_assert.h"
 #include "context/context.h"
@@ -158,4 +158,4 @@ public:
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CDHASHSET_H */
+#endif /* CVC4__CONTEXT__CDHASHSET_H */
diff --git a/src/context/cdhashset_forward.h b/src/context/cdhashset_forward.h
index e2a41404b..dbe8ff052 100644
--- a/src/context/cdhashset_forward.h
+++ b/src/context/cdhashset_forward.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__CONTEXT__CDSET_FORWARD_H
-#define __CVC4__CONTEXT__CDSET_FORWARD_H
+#ifndef CVC4__CONTEXT__CDSET_FORWARD_H
+#define CVC4__CONTEXT__CDSET_FORWARD_H
 
 #include <functional>
 
@@ -35,4 +35,4 @@ class CDHashSet;
 }  // namespace context
 }  // namespace CVC4
 
-#endif /* __CVC4__CONTEXT__CDSET_FORWARD_H */
+#endif /* CVC4__CONTEXT__CDSET_FORWARD_H */
diff --git a/src/context/cdinsert_hashmap_forward.h b/src/context/cdinsert_hashmap_forward.h
index d89a17990..a1559a078 100644
--- a/src/context/cdinsert_hashmap_forward.h
+++ b/src/context/cdinsert_hashmap_forward.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
-#define __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
+#ifndef CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
+#define CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
 
 #include <functional>
 
@@ -35,4 +35,4 @@ class CDInsertHashMap;
 }  // namespace context
 }  // namespace CVC4
 
-#endif /* __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */
+#endif /* CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */
diff --git a/src/context/cdlist.h b/src/context/cdlist.h
index e9b9ccdff..dda88a0fd 100644
--- a/src/context/cdlist.h
+++ b/src/context/cdlist.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONTEXT__CDLIST_H
-#define __CVC4__CONTEXT__CDLIST_H
+#ifndef CVC4__CONTEXT__CDLIST_H
+#define CVC4__CONTEXT__CDLIST_H
 
 #include <iterator>
 #include <memory>
@@ -436,4 +436,4 @@ class CDList<T, CleanUp, ContextMemoryAllocator<T> > : public ContextObj {
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CDLIST_H */
+#endif /* CVC4__CONTEXT__CDLIST_H */
diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h
index 3cdb1962a..d7b1cbc61 100644
--- a/src/context/cdlist_forward.h
+++ b/src/context/cdlist_forward.h
@@ -29,8 +29,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__CONTEXT__CDLIST_FORWARD_H
-#define __CVC4__CONTEXT__CDLIST_FORWARD_H
+#ifndef CVC4__CONTEXT__CDLIST_FORWARD_H
+#define CVC4__CONTEXT__CDLIST_FORWARD_H
 
 #include <memory>
 
@@ -53,4 +53,4 @@ class CDList;
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CDLIST_FORWARD_H */
+#endif /* CVC4__CONTEXT__CDLIST_FORWARD_H */
diff --git a/src/context/cdo.h b/src/context/cdo.h
index 47116d9bb..fe588afb0 100644
--- a/src/context/cdo.h
+++ b/src/context/cdo.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONTEXT__CDO_H
-#define __CVC4__CONTEXT__CDO_H
+#ifndef CVC4__CONTEXT__CDO_H
+#define CVC4__CONTEXT__CDO_H
 
 #include "base/cvc4_assert.h"
 #include "context/context.h"
@@ -180,4 +180,4 @@ public:
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CDO_H */
+#endif /* CVC4__CONTEXT__CDO_H */
diff --git a/src/context/cdqueue.h b/src/context/cdqueue.h
index 7187e9e7f..6ad0e9339 100644
--- a/src/context/cdqueue.h
+++ b/src/context/cdqueue.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONTEXT__CDQUEUE_H
-#define __CVC4__CONTEXT__CDQUEUE_H
+#ifndef CVC4__CONTEXT__CDQUEUE_H
+#define CVC4__CONTEXT__CDQUEUE_H
 
 #include "context/context.h"
 #include "context/cdlist.h"
@@ -166,4 +166,4 @@ public:
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CDQUEUE_H */
+#endif /* CVC4__CONTEXT__CDQUEUE_H */
diff --git a/src/context/cdtrail_queue.h b/src/context/cdtrail_queue.h
index dfd5a1353..ad2bef54c 100644
--- a/src/context/cdtrail_queue.h
+++ b/src/context/cdtrail_queue.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONTEXT__CDTRAIL_QUEUE_H
-#define __CVC4__CONTEXT__CDTRAIL_QUEUE_H
+#ifndef CVC4__CONTEXT__CDTRAIL_QUEUE_H
+#define CVC4__CONTEXT__CDTRAIL_QUEUE_H
 
 #include "context/context.h"
 #include "context/cdlist.h"
@@ -92,4 +92,4 @@ public:
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CDTRAIL_QUEUE_H */
+#endif /* CVC4__CONTEXT__CDTRAIL_QUEUE_H */
diff --git a/src/context/context.h b/src/context/context.h
index fee1efa05..d9d73f770 100644
--- a/src/context/context.h
+++ b/src/context/context.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONTEXT__CONTEXT_H
-#define __CVC4__CONTEXT__CONTEXT_H
+#ifndef CVC4__CONTEXT__CONTEXT_H
+#define CVC4__CONTEXT__CONTEXT_H
 
 #include <cstdlib>
 #include <cstring>
@@ -745,4 +745,4 @@ inline void Scope::addToChain(ContextObj* pContextObj)
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CONTEXT_H */
+#endif /* CVC4__CONTEXT__CONTEXT_H */
diff --git a/src/context/context_mm.h b/src/context/context_mm.h
index 157034d7f..51726f36e 100644
--- a/src/context/context_mm.h
+++ b/src/context/context_mm.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONTEXT__CONTEXT_MM_H
-#define __CVC4__CONTEXT__CONTEXT_MM_H
+#ifndef CVC4__CONTEXT__CONTEXT_MM_H
+#define CVC4__CONTEXT__CONTEXT_MM_H
 
 #include <deque>
 #include <limits>
@@ -266,4 +266,4 @@ inline bool operator!=(const ContextMemoryAllocator<T>& a1,
 }/* CVC4::context namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONTEXT__CONTEXT_MM_H */
+#endif /* CVC4__CONTEXT__CONTEXT_MM_H */