Rename namespace CVC4 to CVC5. (#6249)

18 files changed, 54 insertions, 60 deletions

diff --git a/src/context/backtrackable.h b/src/context/backtrackable.h
index 7ef91617d..2d5416eab 100644
--- a/src/context/backtrackable.h
+++ b/src/context/backtrackable.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include "context/cdo.h"
 
-namespace CVC4 {
+namespace CVC5 {
 
 template <class T> class List;
 template <class T> class List_iterator;
@@ -217,6 +217,6 @@ template <class T> void Backtracker<T>::checkConsistency() {
   Assert(curr_level == pop_level);
 }
 
-}/* CVC4 namespace */
+}  // namespace CVC5
 
 #endif /* CVC4__UTIL__BACKTRACKABLE_H */
diff --git a/src/context/cddense_set.h b/src/context/cddense_set.h
index 168e901a8..765e0f75d 100644
--- a/src/context/cddense_set.h
+++ b/src/context/cddense_set.h
@@ -29,7 +29,7 @@
 
 #include "util/index.h"
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 template <class CleanUp = DefaultCleanUp<Index> >
@@ -96,6 +96,5 @@ public:
 
 };/* class CDDenseSet<> */
 
-
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h
index 4ab552001..165080bd1 100644
--- a/src/context/cdhashmap.h
+++ b/src/context/cdhashmap.h
@@ -91,7 +91,7 @@
 #include "context/cdhashmap_forward.h"
 #include "context/context.h"
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 // Auxiliary class: almost the same as CDO (see cdo.h)
@@ -452,7 +452,7 @@ public:
 
 };/* class CDHashMap<> */
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDHASHMAP_H */
diff --git a/src/context/cdhashmap_forward.h b/src/context/cdhashmap_forward.h
index 7ef3874a9..b34981c73 100644
--- a/src/context/cdhashmap_forward.h
+++ b/src/context/cdhashmap_forward.h
@@ -30,13 +30,12 @@
 
 /// \cond internals
 
-
-namespace CVC4 {
-  namespace context {
-    template <class Key, class Data, class HashFcn = std::hash<Key> >
-    class CDHashMap;
-  }/* CVC4::context namespace */
-}/* CVC4 namespace */
+namespace CVC5 {
+namespace context {
+template <class Key, class Data, class HashFcn = std::hash<Key> >
+class CDHashMap;
+}  // namespace context
+}  // namespace CVC5
 
 /// \endcond
 
diff --git a/src/context/cdhashset.h b/src/context/cdhashset.h
index 665bf8f0d..418bc8bf0 100644
--- a/src/context/cdhashset.h
+++ b/src/context/cdhashset.h
@@ -23,7 +23,7 @@
 #include "context/cdinsert_hashmap.h"
 #include "context/context.h"
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 template <class V, class HashFcn>
@@ -155,7 +155,7 @@ public:
 
 };/* class CDHashSet */
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDHASHSET_H */
diff --git a/src/context/cdhashset_forward.h b/src/context/cdhashset_forward.h
index e8877c3c2..81154db5d 100644
--- a/src/context/cdhashset_forward.h
+++ b/src/context/cdhashset_forward.h
@@ -28,11 +28,11 @@
 
 #include <functional>
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 template <class V, class HashFcn = std::hash<V> >
 class CDHashSet;
 }  // namespace context
-}  // namespace CVC4
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDSET_FORWARD_H */
diff --git a/src/context/cdinsert_hashmap.h b/src/context/cdinsert_hashmap.h
index 56004463a..6bd15c645 100644
--- a/src/context/cdinsert_hashmap.h
+++ b/src/context/cdinsert_hashmap.h
@@ -45,7 +45,7 @@
 
 #pragma once
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 
@@ -406,5 +406,5 @@ class CDInsertHashMap<TNode, Data, HashFcn> : public ContextObj {
                 "Cannot create a CDInsertHashMap with TNode keys");
 };
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
diff --git a/src/context/cdinsert_hashmap_forward.h b/src/context/cdinsert_hashmap_forward.h
index 07e8d16e9..9729ea2f4 100644
--- a/src/context/cdinsert_hashmap_forward.h
+++ b/src/context/cdinsert_hashmap_forward.h
@@ -28,11 +28,11 @@
 
 #include <functional>
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 template <class Key, class Data, class HashFcn = std::hash<Key> >
 class CDInsertHashMap;
 }  // namespace context
-}  // namespace CVC4
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */
diff --git a/src/context/cdlist.h b/src/context/cdlist.h
index b1c8229f0..7174152cb 100644
--- a/src/context/cdlist.h
+++ b/src/context/cdlist.h
@@ -29,7 +29,7 @@
 #include "context/context.h"
 #include "context/context_mm.h"
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 /**
@@ -434,7 +434,7 @@ class CDList<T, CleanUp, ContextMemoryAllocator<T> > : public ContextObj {
                 "Cannot create a CDList with a ContextMemoryAllocator.");
 };
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDLIST_H */
diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h
index 576463399..bd3a911af 100644
--- a/src/context/cdlist_forward.h
+++ b/src/context/cdlist_forward.h
@@ -36,7 +36,7 @@
 
 /// \cond internals
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 template <class T>
@@ -50,7 +50,7 @@ class CDList;
 
 /// \endcond
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDLIST_FORWARD_H */
diff --git a/src/context/cdmaybe.h b/src/context/cdmaybe.h
index 8b62c619f..1455ca5f0 100644
--- a/src/context/cdmaybe.h
+++ b/src/context/cdmaybe.h
@@ -24,7 +24,7 @@
 #include "context/cdo.h"
 #include "context/context.h"
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 class CDRaised {
@@ -73,6 +73,5 @@ public:
   }
 };/* class CDMaybe<T> */
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
-
+}  // namespace context
+}  // namespace CVC5
diff --git a/src/context/cdo.h b/src/context/cdo.h
index c6d9e93f6..79e73d38f 100644
--- a/src/context/cdo.h
+++ b/src/context/cdo.h
@@ -21,8 +21,7 @@
 
 #include "context/context.h"
 
-
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 /**
@@ -176,7 +175,7 @@ public:
 
 };/* class CDO */
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDO_H */
diff --git a/src/context/cdqueue.h b/src/context/cdqueue.h
index 3659f5653..20d078184 100644
--- a/src/context/cdqueue.h
+++ b/src/context/cdqueue.h
@@ -28,7 +28,7 @@
 #include "context/context.h"
 #include "context/cdlist.h"
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 template <class T, class CleanUp = DefaultCleanUp<T>, class Allocator = std::allocator<T> >
@@ -162,7 +162,7 @@ public:
 
 };/* class CDQueue<> */
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDQUEUE_H */
diff --git a/src/context/cdtrail_queue.h b/src/context/cdtrail_queue.h
index f505004cb..d9bf6d572 100644
--- a/src/context/cdtrail_queue.h
+++ b/src/context/cdtrail_queue.h
@@ -25,7 +25,7 @@
 #include "context/cdlist.h"
 #include "context/cdo.h"
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 class Context;
@@ -89,7 +89,7 @@ public:
 
 };/* class CDTrailQueue<> */
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CDTRAIL_QUEUE_H */
diff --git a/src/context/context.cpp b/src/context/context.cpp
index 06485c0ba..88c783303 100644
--- a/src/context/context.cpp
+++ b/src/context/context.cpp
@@ -21,8 +21,7 @@
 #include "base/check.h"
 #include "context/context.h"
 
-
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 
@@ -388,5 +387,5 @@ void Scope::enqueueToGarbageCollect(ContextObj* obj) {
   d_garbage->push_back(obj);
 }
 
-} /* CVC4::context namespace */
-} /* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
diff --git a/src/context/context.h b/src/context/context.h
index d9f98b993..7cf72e4d2 100644
--- a/src/context/context.h
+++ b/src/context/context.h
@@ -29,8 +29,7 @@
 #include "base/output.h"
 #include "context/context_mm.h"
 
-
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 class Context;
@@ -740,7 +739,7 @@ inline void Scope::addToChain(ContextObj* pContextObj)
   d_pContextObjList = pContextObj;
 }
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CONTEXT_H */
diff --git a/src/context/context_mm.cpp b/src/context/context_mm.cpp
index 4d9413320..2a69bc26f 100644
--- a/src/context/context_mm.cpp
+++ b/src/context/context_mm.cpp
@@ -29,7 +29,7 @@
 #include "base/output.h"
 #include "context/context_mm.h"
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 #ifndef CVC4_DEBUG_CONTEXT_MEMORY_MANAGER
@@ -177,5 +177,5 @@ unsigned ContextMemoryManager::getMaxAllocationSize()
 
 #endif /* CVC4_DEBUG_CONTEXT_MEMORY_MANAGER */
 
-} /* CVC4::context namespace */
-} /* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
diff --git a/src/context/context_mm.h b/src/context/context_mm.h
index e20b9fdb9..72c2bcd3a 100644
--- a/src/context/context_mm.h
+++ b/src/context/context_mm.h
@@ -25,7 +25,7 @@
 #endif
 #include <vector>
 
-namespace CVC4 {
+namespace CVC5 {
 namespace context {
 
 #ifndef CVC4_DEBUG_CONTEXT_MEMORY_MANAGER
@@ -261,7 +261,7 @@ inline bool operator!=(const ContextMemoryAllocator<T>& a1,
   return a1.d_mm != a2.d_mm;
 }
 
-}/* CVC4::context namespace */
-}/* CVC4 namespace */
+}  // namespace context
+}  // namespace CVC5
 
 #endif /* CVC4__CONTEXT__CONTEXT_MM_H */