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

Fixes 2887.

diff --git a/src/api/cvc4cpp.h b/src/api/cvc4cpp.h
index 95d917f5407be33cbd2379ddd62eb970990d3ff8..203586066d995fae3126b3abce1d5f66d66bdaf5 100644 (file)
--- a/src/api/cvc4cpp.h
+++ b/src/api/cvc4cpp.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__API__CVC4CPP_H
-#define __CVC4__API__CVC4CPP_H
+#ifndef CVC4__API__CVC4CPP_H
+#define CVC4__API__CVC4CPP_H
 
 #include "api/cvc4cppkind.h"
 

diff --git a/src/api/cvc4cppkind.h b/src/api/cvc4cppkind.h
index f587f44bed093c0d44125b4b15cd47d90ea179c1..3aba6cebbd20c01dcd53b9bdfa152ca12d677b3b 100644 (file)
--- a/src/api/cvc4cppkind.h
+++ b/src/api/cvc4cppkind.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__API__CVC4CPPKIND_H
-#define __CVC4__API__CVC4CPPKIND_H
+#ifndef CVC4__API__CVC4CPPKIND_H
+#define CVC4__API__CVC4CPPKIND_H
 
 #include <ostream>
 
@@ -33,7 +33,7 @@ namespace api {
  *
  * Note that the underlying type of Kind must be signed (to enable range
  * checks for validity). The size of this type depends on the size of
- * CVC4::Kind (__CVC4__EXPR__NODE_VALUE__NBITS__KIND, currently 10 bits,
+ * CVC4::Kind (CVC4__EXPR__NODE_VALUE__NBITS__KIND, currently 10 bits,
  * see expr/metakind_template.h).
  */
 enum CVC4_PUBLIC Kind : int32_t

diff --git a/src/base/configuration.h b/src/base/configuration.h
index da11b95477bfc455bc7e2265f2d6cc3f1b224196..fc149587bddad419cc07bc1cad9c7bd208a6f735 100644 (file)
--- a/src/base/configuration.h
+++ b/src/base/configuration.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__CONFIGURATION_H
-#define __CVC4__CONFIGURATION_H
+#ifndef CVC4__CONFIGURATION_H
+#define CVC4__CONFIGURATION_H
 
 #include <string>
 
@@ -132,4 +132,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONFIGURATION_H */
+#endif /* CVC4__CONFIGURATION_H */

diff --git a/src/base/configuration_private.h b/src/base/configuration_private.h
index 0476dc24e250acb926310929474cf966e655c3cc..3b06a9e6a698bc5c13216dace9c34176cba8dbf4 100644 (file)
--- a/src/base/configuration_private.h
+++ b/src/base/configuration_private.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CONFIGURATION_PRIVATE_H
-#define __CVC4__CONFIGURATION_PRIVATE_H
+#ifndef CVC4__CONFIGURATION_PRIVATE_H
+#define CVC4__CONFIGURATION_PRIVATE_H
 
 #include <string>
 
@@ -174,4 +174,4 @@ namespace CVC4 {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CONFIGURATION_PRIVATE_H */
+#endif /* CVC4__CONFIGURATION_PRIVATE_H */

diff --git a/src/base/cvc4_assert.h b/src/base/cvc4_assert.h
index e311639f91fd0d7d76e54c20d7ff3410afcc7ad6..a29e6f545e89d850ab6a9453eab93e3fe288d23b 100644 (file)
--- a/src/base/cvc4_assert.h
+++ b/src/base/cvc4_assert.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__ASSERT_H
-#define __CVC4__ASSERT_H
+#ifndef CVC4__ASSERT_H
+#define CVC4__ASSERT_H
 
 #include <cstdarg>
 #include <cstdio>
@@ -317,4 +317,4 @@ void debugAssertionFailed(const AssertionException& thisException,
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__ASSERT_H */
+#endif /* CVC4__ASSERT_H */

diff --git a/src/base/cvc4_check.h b/src/base/cvc4_check.h
index 0565ad22a8c16240a63b7b1ca57db5de2a175224..7039311081589b9a64cff40309aeb6c4599e833a 100644 (file)
--- a/src/base/cvc4_check.h
+++ b/src/base/cvc4_check.h
@@ -34,8 +34,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CHECK_H
-#define __CVC4__CHECK_H
+#ifndef CVC4__CHECK_H
+#define CVC4__CHECK_H
 
 #include <ostream>
 
@@ -143,4 +143,4 @@ class OstreamVoider
 
 }  // namespace CVC4
 
-#endif /* __CVC4__CHECK_H */
+#endif /* CVC4__CHECK_H */

diff --git a/src/base/exception.h b/src/base/exception.h
index c3c785fc18ce66f59c01c945242a67c2e796dd8c..51829c86c560fcc7d0563d55da7b1368a814697e 100644 (file)
--- a/src/base/exception.h
+++ b/src/base/exception.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__EXCEPTION_H
-#define __CVC4__EXCEPTION_H
+#ifndef CVC4__EXCEPTION_H
+#define CVC4__EXCEPTION_H
 
 #include <cstdarg>
 #include <cstdlib>
@@ -166,4 +166,4 @@ private:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXCEPTION_H */
+#endif /* CVC4__EXCEPTION_H */

diff --git a/src/base/listener.h b/src/base/listener.h
index 0c6045b48a7a4f1a7eff25088eefcaaf9a38dc6e..842567646f023a62d5dd66c4d01758417778167a 100644 (file)
--- a/src/base/listener.h
+++ b/src/base/listener.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__LISTENER_H
-#define __CVC4__LISTENER_H
+#ifndef CVC4__LISTENER_H
+#define CVC4__LISTENER_H
 
 #include <list>
 
@@ -161,4 +161,4 @@ class ListenerRegistrationList {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__LISTENER_H */
+#endif /* CVC4__LISTENER_H */

diff --git a/src/base/map_util.h b/src/base/map_util.h
index d571459179d0d4bc9df40de8c8da4c6afb359596..786e22ae0c4e310d5c3cdb34d250a115386765ee 100644 (file)
--- a/src/base/map_util.h
+++ b/src/base/map_util.h
@@ -35,8 +35,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BASE__MAP_UTIL_H
-#define __CVC4__BASE__MAP_UTIL_H
+#ifndef CVC4__BASE__MAP_UTIL_H
+#define CVC4__BASE__MAP_UTIL_H
 
 #include "base/cvc4_check.h"
 
@@ -94,4 +94,4 @@ const MapMappedTypeT<M>& FindOrDie(const M& map, const MapKeyTypeT<M>& key)
 
 }  // namespace CVC4
 
-#endif /* __CVC4__BASE__MAP_UTIL_H */
+#endif /* CVC4__BASE__MAP_UTIL_H */

diff --git a/src/base/modal_exception.h b/src/base/modal_exception.h
index 7d6522ea76e877d0c4974d0242be677f71a1e7bb..4fa9349fb771d5058bb9193b37c7bb0f31533de3 100644 (file)
--- a/src/base/modal_exception.h
+++ b/src/base/modal_exception.h
@@ -19,8 +19,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SMT__MODAL_EXCEPTION_H
-#define __CVC4__SMT__MODAL_EXCEPTION_H
+#ifndef CVC4__SMT__MODAL_EXCEPTION_H
+#define CVC4__SMT__MODAL_EXCEPTION_H
 
 #include "base/exception.h"
 
@@ -58,4 +58,4 @@ class CVC4_PUBLIC RecoverableModalException : public CVC4::ModalException {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT__MODAL_EXCEPTION_H */
+#endif /* CVC4__SMT__MODAL_EXCEPTION_H */

diff --git a/src/base/output.h b/src/base/output.h
index 9fe4ec34d145dbe64499a985289aa4d1bb9f256c..c3a073580f5a7c7483276c01743ac831e8c5bf13 100644 (file)
--- a/src/base/output.h
+++ b/src/base/output.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private_library.h"
 
-#ifndef __CVC4__OUTPUT_H
-#define __CVC4__OUTPUT_H
+#ifndef CVC4__OUTPUT_H
+#define CVC4__OUTPUT_H
 
 #include <ios>
 #include <iostream>
@@ -543,4 +543,4 @@ inline IndentedScope::~IndentedScope() {}
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__OUTPUT_H */
+#endif /* CVC4__OUTPUT_H */

diff --git a/src/bindings/java_iterator_adapter.h b/src/bindings/java_iterator_adapter.h
index d164fe56389fd33e0cfbf543b1fc3054a8d4831e..bf1b22e1b3b5f0b4729a9b8af912f7c27203062f 100644 (file)
--- a/src/bindings/java_iterator_adapter.h
+++ b/src/bindings/java_iterator_adapter.h
@@ -27,8 +27,8 @@
 #  error This should only be included from the Java bindings layer.
 #endif /* SWIGJAVA */
 
-#ifndef __CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H
-#define __CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H
+#ifndef CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H
+#define CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H
 
 namespace CVC4 {
 
@@ -56,4 +56,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H */
+#endif /* CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H */

diff --git a/src/bindings/java_stream_adapters.h b/src/bindings/java_stream_adapters.h
index d88f34ca6d81fe190d2a4eb812785c1022d74c51..f2e89c004d10f0b397772a4b13fb367aaf919219 100644 (file)
--- a/src/bindings/java_stream_adapters.h
+++ b/src/bindings/java_stream_adapters.h
@@ -37,8 +37,8 @@
 #include <string>
 #include <jni.h>
 
-#ifndef __CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H
-#define __CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H
+#ifndef CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H
+#define CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H
 
 namespace CVC4 {
 
@@ -105,4 +105,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H */
+#endif /* CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H */

diff --git a/src/bindings/swig.h b/src/bindings/swig.h
index eb05cc080b098b1c369c61aea55d14571b9bc688..81f197d5f609ff9b5e5829285a700616db40b73b 100644 (file)
--- a/src/bindings/swig.h
+++ b/src/bindings/swig.h
@@ -14,8 +14,8 @@
  ** Common swig checks and definitions, when generating swig interfaces.
  **/
 
-#ifndef __CVC4__BINDINGS__SWIG_H
-#define __CVC4__BINDINGS__SWIG_H
+#ifndef CVC4__BINDINGS__SWIG_H
+#define CVC4__BINDINGS__SWIG_H
 
 #ifndef SWIG
 #  error This file should only be included when generating swig interfaces.
@@ -30,4 +30,4 @@
 // swig doesn't like GCC attributes
 #define __attribute__(x)
 
-#endif /* __CVC4__BINDINGS__SWIG_H */
+#endif /* CVC4__BINDINGS__SWIG_H */

diff --git a/src/context/backtrackable.h b/src/context/backtrackable.h
index 31cbee2b1d335dce6f9ecbde81943587dbbb1afb..5d358941f00f7f8b6166fdbeb05341d0340e0928 100644 (file)
--- 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 8d97bfa66f113f0952c80b9bc123b95092749475..0a1f3387c2a0edf4db7069b40b7867b91f8759c8 100644 (file)
--- 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 a98bbe649203140aadbc7a7c345b8472a8832dc9..667e7199024d6cf690a4dc3a44ef589833508ae5 100644 (file)
--- 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 191ac1ac793f3d721c902dd94d180f54c04694b0..a35ecae8803eb10c8f28dfca92e2bc73bfc1c3d4 100644 (file)
--- 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 e2a41404bbb595f9543540b747b331c949f7a1cc..dbe8ff052ce824dc7818befbc6e4834aa0a6bde0 100644 (file)
--- 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 d89a17990592b7b27449193b8da51536e019dd93..a1559a078f65ef322aa295f66280a123aed29755 100644 (file)
--- 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 e9b9ccdff31d976e75e3cefb1881bd6f59c6010f..dda88a0fdd76a98e02861745f1b2882d3af6f40c 100644 (file)
--- 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 3cdb1962a2a8dc9931b3ccbc8f0dc47d01ee51bc..d7b1cbc61367b0106b5bd42e01a2956ca9b2fb5e 100644 (file)
--- 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 47116d9bbf960a3620d6fb2ceada4de4dc359e3d..fe588afb0fd7b4651e4b2cae309962f6e7e13de6 100644 (file)
--- 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 7187e9e7f43d23a4a378683706ae4ae20f61af2b..6ad0e93393e2850a1d34b510b4ea49d4ef39f69a 100644 (file)
--- 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 dfd5a13538eecb941ee77231f256b22512b62d95..ad2bef54cc3f545a3c51818a082db878dbb4d994 100644 (file)
--- 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 fee1efa05ca31f30af6316f024d801b5682c70ea..d9d73f770d94bbf4488c0ae326b8209aceddbd42 100644 (file)
--- 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 157034d7f6c82196e6998f1b343df4fe904a535b..51726f36ee7e7fbf57adaa304ff33ab437a26081 100644 (file)
--- 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 */

diff --git a/src/decision/decision_attributes.h b/src/decision/decision_attributes.h
index 387c506ec1c7e9fe453b814587c2871847b660ff..bdcc722ecfd14f64f4e2586c576e27db14d25afd 100644 (file)
--- a/src/decision/decision_attributes.h
+++ b/src/decision/decision_attributes.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__DECISION__DECISION_ATTRIBUTES_H
-#define __CVC4__DECISION__DECISION_ATTRIBUTES_H
+#ifndef CVC4__DECISION__DECISION_ATTRIBUTES_H
+#define CVC4__DECISION__DECISION_ATTRIBUTES_H
 
 #include "options/decision_weight.h"
 #include "expr/attribute.h"
@@ -33,4 +33,4 @@ typedef expr::Attribute<attr::DecisionWeightTag, DecisionWeight> DecisionWeightA
 }/* CVC4::decision namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__DECISION__DECISION_ATTRIBUTES_H */
+#endif /* CVC4__DECISION__DECISION_ATTRIBUTES_H */

diff --git a/src/decision/decision_engine.h b/src/decision/decision_engine.h
index dc8cd30fa0eeb6851b5ee97641dbae2830e737ec..73d7e2a3197473df62d0bdf74418076d3a4ed1ff 100644 (file)
--- a/src/decision/decision_engine.h
+++ b/src/decision/decision_engine.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__DECISION__DECISION_ENGINE_H
-#define __CVC4__DECISION__DECISION_ENGINE_H
+#ifndef CVC4__DECISION__DECISION_ENGINE_H
+#define CVC4__DECISION__DECISION_ENGINE_H
 
 #include <vector>
 
@@ -219,4 +219,4 @@ private:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__DECISION__DECISION_ENGINE_H */
+#endif /* CVC4__DECISION__DECISION_ENGINE_H */

diff --git a/src/decision/decision_strategy.h b/src/decision/decision_strategy.h
index 842178ed0d2720d4b36b5dc8acd07f367e7d7fae..f408515de07433245b163f88469ec44d4d93eb17 100644 (file)
--- a/src/decision/decision_strategy.h
+++ b/src/decision/decision_strategy.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__DECISION__DECISION_STRATEGY_H
-#define __CVC4__DECISION__DECISION_STRATEGY_H
+#ifndef CVC4__DECISION__DECISION_STRATEGY_H
+#define CVC4__DECISION__DECISION_STRATEGY_H
 
 #include "preprocessing/assertion_pipeline.h"
 #include "prop/sat_solver_types.h"
@@ -75,4 +75,4 @@ public:
 }/* CVC4::decision namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__DECISION__DECISION_STRATEGY_H */
+#endif /* CVC4__DECISION__DECISION_STRATEGY_H */

diff --git a/src/decision/justification_heuristic.h b/src/decision/justification_heuristic.h
index 5597f4c84b85cea9b6b6ab2b03c14804406d2e5e..b2c32562893863bea03dc47fd48303b9a07014d9 100644 (file)
--- a/src/decision/justification_heuristic.h
+++ b/src/decision/justification_heuristic.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__DECISION__JUSTIFICATION_HEURISTIC
-#define __CVC4__DECISION__JUSTIFICATION_HEURISTIC
+#ifndef CVC4__DECISION__JUSTIFICATION_HEURISTIC
+#define CVC4__DECISION__JUSTIFICATION_HEURISTIC
 
 #include <unordered_set>
 
@@ -181,4 +181,4 @@ public:
 }/* namespace decision */
 }/* namespace CVC4 */
 
-#endif /* __CVC4__DECISION__JUSTIFICATION_HEURISTIC */
+#endif /* CVC4__DECISION__JUSTIFICATION_HEURISTIC */

diff --git a/src/expr/array.h b/src/expr/array.h
index b313a694b15025ad4a909acf234de5a4e769348f..a53ac3cd223f560538c97de00f7cebc367dafef9 100644 (file)
--- a/src/expr/array.h
+++ b/src/expr/array.h
@@ -16,11 +16,11 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__ARRAY_H
-#define __CVC4__ARRAY_H
+#ifndef CVC4__ARRAY_H
+#define CVC4__ARRAY_H
 
 // we get ArrayType right now by #including type.h.
 // array.h is still useful for the auto-generated kinds #includes.
 #include "expr/type.h"
 
-#endif /* __CVC4__ARRAY_H */
+#endif /* CVC4__ARRAY_H */

diff --git a/src/expr/array_store_all.h b/src/expr/array_store_all.h
index 3b1112e4f637db7840b7a1fb773371259809bcc8..0adcfde36282843cce37b16757a6f9fb73c140a1 100644 (file)
--- a/src/expr/array_store_all.h
+++ b/src/expr/array_store_all.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__ARRAY_STORE_ALL_H
-#define __CVC4__ARRAY_STORE_ALL_H
+#ifndef CVC4__ARRAY_STORE_ALL_H
+#define CVC4__ARRAY_STORE_ALL_H
 
 #include <iosfwd>
 #include <memory>
@@ -72,4 +72,4 @@ struct CVC4_PUBLIC ArrayStoreAllHashFunction {
 
 }  // namespace CVC4
 
-#endif /* __CVC4__ARRAY_STORE_ALL_H */
+#endif /* CVC4__ARRAY_STORE_ALL_H */

diff --git a/src/expr/ascription_type.h b/src/expr/ascription_type.h
index 8089a2c85ce45d8f3fc4a4709567535533abe03f..94258896afa66252046bac03798298520220ee18 100644 (file)
--- a/src/expr/ascription_type.h
+++ b/src/expr/ascription_type.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__ASCRIPTION_TYPE_H
-#define __CVC4__ASCRIPTION_TYPE_H
+#ifndef CVC4__ASCRIPTION_TYPE_H
+#define CVC4__ASCRIPTION_TYPE_H
 
 #include "expr/type.h"
 
@@ -63,4 +63,4 @@ inline std::ostream& operator<<(std::ostream& out, AscriptionType at) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__ASCRIPTION_TYPE_H */
+#endif /* CVC4__ASCRIPTION_TYPE_H */

diff --git a/src/expr/attribute.h b/src/expr/attribute.h
index bccea5dda64e7cf8e85c8059a3996f9c89d40863..46302fc9fb1e34a8b69240aee33b1516d8accaf9 100644 (file)
--- a/src/expr/attribute.h
+++ b/src/expr/attribute.h
@@ -21,8 +21,8 @@
 #include "expr/node.h"
 #include "expr/type_node.h"
 
-#ifndef __CVC4__EXPR__ATTRIBUTE_H
-#define __CVC4__EXPR__ATTRIBUTE_H
+#ifndef CVC4__EXPR__ATTRIBUTE_H
+#define CVC4__EXPR__ATTRIBUTE_H
 
 #include <string>
 #include <stdint.h>
@@ -578,4 +578,4 @@ NodeManager::setAttribute(TypeNode n, const AttrKind&,
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR__ATTRIBUTE_H */
+#endif /* CVC4__EXPR__ATTRIBUTE_H */

diff --git a/src/expr/attribute_internals.h b/src/expr/attribute_internals.h
index 83056896f3d1bbdf2eafcd740c5cd5de2a901d25..e47dce4340cf3a7f7ec287c8c13282e3df48394f 100644 (file)
--- a/src/expr/attribute_internals.h
+++ b/src/expr/attribute_internals.h
@@ -20,8 +20,8 @@
 #  error expr/attribute_internals.h should only be included by expr/attribute.h
 #endif /* CVC4_ATTRIBUTE_H__INCLUDING__ATTRIBUTE_INTERNALS_H */
 
-#ifndef __CVC4__EXPR__ATTRIBUTE_INTERNALS_H
-#define __CVC4__EXPR__ATTRIBUTE_INTERNALS_H
+#ifndef CVC4__EXPR__ATTRIBUTE_INTERNALS_H
+#define CVC4__EXPR__ATTRIBUTE_INTERNALS_H
 
 #include <cstdint>
 #include <unordered_map>
@@ -486,4 +486,4 @@ const uint64_t Attribute<T, bool, context_dep>::s_id =
 }/* CVC4::expr namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR__ATTRIBUTE_INTERNALS_H */
+#endif /* CVC4__EXPR__ATTRIBUTE_INTERNALS_H */

diff --git a/src/expr/chain.h b/src/expr/chain.h
index 99df9ee7b7448f14e2b4440468543220fb6681c4..9df819b4d40da86736876d5c98b2cdfc0773ac77 100644 (file)
--- a/src/expr/chain.h
+++ b/src/expr/chain.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__CHAIN_H
-#define __CVC4__CHAIN_H
+#ifndef CVC4__CHAIN_H
+#define CVC4__CHAIN_H
 
 #include "expr/kind.h"
 #include <iostream>
@@ -48,4 +48,4 @@ struct CVC4_PUBLIC ChainHashFunction {
 
 }/* CVC4 namespace */
 
-#endif  /* __CVC4__CHAIN_H */
+#endif  /* CVC4__CHAIN_H */

diff --git a/src/expr/datatype.h b/src/expr/datatype.h
index 3cc02d3c5bfb73ea8797de9cdc4cfadc5de71331..0e8ace709984fb9c9c03512798f5e679a38c5e39 100644 (file)
--- a/src/expr/datatype.h
+++ b/src/expr/datatype.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__DATATYPE_H
-#define __CVC4__DATATYPE_H
+#ifndef CVC4__DATATYPE_H
+#define CVC4__DATATYPE_H
 
 #include <functional>
 #include <iostream>
@@ -1288,4 +1288,4 @@ inline DatatypeConstructor::const_iterator DatatypeConstructor::end() const
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__DATATYPE_H */
+#endif /* CVC4__DATATYPE_H */

diff --git a/src/expr/expr_iomanip.h b/src/expr/expr_iomanip.h
index 7203063b7b3fd719549e7f76843a56d49826b4a7..9a582f8c8324d81295136aff887a89be2ace789c 100644 (file)
--- a/src/expr/expr_iomanip.h
+++ b/src/expr/expr_iomanip.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__EXPR__EXPR_IOMANIP_H
-#define __CVC4__EXPR__EXPR_IOMANIP_H
+#ifndef CVC4__EXPR__EXPR_IOMANIP_H
+#define CVC4__EXPR__EXPR_IOMANIP_H
 
 #include <iosfwd>
 
@@ -236,4 +236,4 @@ std::ostream& operator<<(std::ostream& out, ExprSetDepth sd) CVC4_PUBLIC;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR__EXPR_IOMANIP_H */
+#endif /* CVC4__EXPR__EXPR_IOMANIP_H */

diff --git a/src/expr/expr_manager_scope.h b/src/expr/expr_manager_scope.h
index cad5195ddda0be0271c0da025c72c54c3082ce16..b494796a17cb6515172c88e174280b6ab1af78af 100644 (file)
--- a/src/expr/expr_manager_scope.h
+++ b/src/expr/expr_manager_scope.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__EXPR_MANAGER_SCOPE_H
-#define __CVC4__EXPR_MANAGER_SCOPE_H
+#ifndef CVC4__EXPR_MANAGER_SCOPE_H
+#define CVC4__EXPR_MANAGER_SCOPE_H
 
 #include "expr/expr.h"
 #include "expr/node_manager.h"
@@ -66,4 +66,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR_MANAGER_SCOPE_H */
+#endif /* CVC4__EXPR_MANAGER_SCOPE_H */

diff --git a/src/expr/expr_manager_template.h b/src/expr/expr_manager_template.h
index 2e68328409c91fffadbafcc09d86c1ad8f96c87d..17affaef0709006bfd4709ebd6f03788d717d064 100644 (file)
--- a/src/expr/expr_manager_template.h
+++ b/src/expr/expr_manager_template.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__EXPR_MANAGER_H
-#define __CVC4__EXPR_MANAGER_H
+#ifndef CVC4__EXPR_MANAGER_H
+#define CVC4__EXPR_MANAGER_H
 
 #include <vector>
 
@@ -586,4 +586,4 @@ ${mkConst_instantiations}
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR_MANAGER_H */
+#endif /* CVC4__EXPR_MANAGER_H */

diff --git a/src/expr/expr_stream.h b/src/expr/expr_stream.h
index e4fdeb5986584b3900acf87bdeb88fa6ec7afd40..d31e8e4fcc17747aefa513fd0f9d4d43b3fd5f68 100644 (file)
--- a/src/expr/expr_stream.h
+++ b/src/expr/expr_stream.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__EXPR_STREAM_H
-#define __CVC4__EXPR_STREAM_H
+#ifndef CVC4__EXPR_STREAM_H
+#define CVC4__EXPR_STREAM_H
 
 #include "expr/expr.h"
 
@@ -41,5 +41,5 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR_STREAM_H */
+#endif /* CVC4__EXPR_STREAM_H */
 

diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h
index 71f09825e55c1c0468e1b04ae7ca8a9c1b3d1869..a325900505bd704a3438cdee8ef3f9413be0f11a 100644 (file)
--- a/src/expr/expr_template.h
+++ b/src/expr/expr_template.h
@@ -23,8 +23,8 @@
 // "expr.h" safely, then go on to completely declare their own stuff.
 ${includes}
 
-#ifndef __CVC4__EXPR_H
-#define __CVC4__EXPR_H
+#ifndef CVC4__EXPR_H
+#define CVC4__EXPR_H
 
 #include <stdint.h>
 #include <iosfwd>
@@ -620,4 +620,4 @@ inline size_t ExprHashFunction::operator()(CVC4::Expr e) const {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR_H */
+#endif /* CVC4__EXPR_H */

diff --git a/src/expr/kind_map.h b/src/expr/kind_map.h
index 45e128c37a95e5b13dfd3d84e1dcb1232c27239d..a5ae738021c9fc728515d000869bcd9b91dd4979 100644 (file)
--- a/src/expr/kind_map.h
+++ b/src/expr/kind_map.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__KIND_MAP_H
-#define __CVC4__KIND_MAP_H
+#ifndef CVC4__KIND_MAP_H
+#define CVC4__KIND_MAP_H
 
 #include <stdint.h>
 #include <iterator>
@@ -271,4 +271,4 @@ inline KindMap operator^(Kind k1, KindMap m2) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__KIND_MAP_H */
+#endif /* CVC4__KIND_MAP_H */

diff --git a/src/expr/kind_template.h b/src/expr/kind_template.h
index 820fa6b7d8955e4e50a343db2671060893280d38..93c37f6cc1e302ae8909b4697ce69eebc5606e21 100644 (file)
--- a/src/expr/kind_template.h
+++ b/src/expr/kind_template.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__KIND_H
-#define __CVC4__KIND_H
+#ifndef CVC4__KIND_H
+#define CVC4__KIND_H
 
 #include <iosfwd>
 
@@ -104,4 +104,4 @@ std::string getStatsPrefix(TheoryId theoryId) CVC4_PUBLIC;
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__KIND_H */
+#endif /* CVC4__KIND_H */

diff --git a/src/expr/matcher.h b/src/expr/matcher.h
index a08d177158fae56631c283fb6b85cec8bf860f30..95ece7d23807edc4db289f0794bc63e553e1d562 100644 (file)
--- a/src/expr/matcher.h
+++ b/src/expr/matcher.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__MATCHER_H
-#define __CVC4__MATCHER_H
+#ifndef CVC4__MATCHER_H
+#define CVC4__MATCHER_H
 
 #include <iosfwd>
 #include <string>
@@ -116,4 +116,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__MATCHER_H */
+#endif /* CVC4__MATCHER_H */

diff --git a/src/expr/metakind_template.h b/src/expr/metakind_template.h
index 1da66202b5e872fff4df290d3634fa75d0a64330..3550acf055b96cb447fb410b3be7f48273de8c86 100644 (file)
--- a/src/expr/metakind_template.h
+++ b/src/expr/metakind_template.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__KIND__METAKIND_H
-#define __CVC4__KIND__METAKIND_H
+#ifndef CVC4__KIND__METAKIND_H
+#define CVC4__KIND__METAKIND_H
 
 #include <iosfwd>
 
@@ -118,13 +118,13 @@ namespace kind {
 namespace metakind {
 
 /* these are #defines so their sum can be #if-checked in node_value.h */
-#define __CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT 20
-#define __CVC4__EXPR__NODE_VALUE__NBITS__KIND 10
-#define __CVC4__EXPR__NODE_VALUE__NBITS__ID 40
-#define __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN 26
+#define CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT 20
+#define CVC4__EXPR__NODE_VALUE__NBITS__KIND 10
+#define CVC4__EXPR__NODE_VALUE__NBITS__ID 40
+#define CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN 26
 
 static const unsigned MAX_CHILDREN =
-  (1u << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1;
+  (1u << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1;
 
 }/* CVC4::kind::metakind namespace */
 }/* CVC4::kind namespace */
@@ -143,11 +143,11 @@ struct NodeValuePoolEq {
 
 #include "expr/node_value.h"
 
-#endif /* __CVC4__KIND__METAKIND_H */
+#endif /* CVC4__KIND__METAKIND_H */
 
 ${metakind_includes}
 
-#ifdef __CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
+#ifdef CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
 
 namespace CVC4 {
 
@@ -234,4 +234,4 @@ ${theory_alternate_doc}";
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP */
+#endif /* CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP */

diff --git a/src/expr/node.h b/src/expr/node.h
index cd7a1f839fa9776e1addac3cfc60b7e8d72e1d36..935cde30868156d95941bffa4e8d6a0a0b676136 100644 (file)
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -19,8 +19,8 @@
 // circular dependency
 #include "expr/node_value.h"
 
-#ifndef __CVC4__NODE_H
-#define __CVC4__NODE_H
+#ifndef CVC4__NODE_H
+#define CVC4__NODE_H
 
 #include <stdint.h>
 
@@ -1570,4 +1570,4 @@ static void __attribute__((used)) debugPrintRawTNode(const NodeTemplate<false>&
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__NODE_H */
+#endif /* CVC4__NODE_H */

diff --git a/src/expr/node_algorithm.h b/src/expr/node_algorithm.h
index 0ed6e159b7fd0b7bdccd9154ffd2a576df900d48..656f162ae28c317fb41b2b14af6d52c031918130 100644 (file)
--- a/src/expr/node_algorithm.h
+++ b/src/expr/node_algorithm.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__EXPR__NODE_ALGORITHM_H
-#define __CVC4__EXPR__NODE_ALGORITHM_H
+#ifndef CVC4__EXPR__NODE_ALGORITHM_H
+#define CVC4__EXPR__NODE_ALGORITHM_H
 
 #include <unordered_map>
 #include <vector>

diff --git a/src/expr/node_builder.h b/src/expr/node_builder.h
index 299960c1d3939f726bead9fa41ce95bf005629a5..9128bc1901b188a09a3620d8444e1fa20d21fe54 100644 (file)
--- a/src/expr/node_builder.h
+++ b/src/expr/node_builder.h
@@ -152,8 +152,8 @@
 #include "expr/node.h"
 #include "expr/type_node.h"
 
-#ifndef __CVC4__NODE_BUILDER_H
-#define __CVC4__NODE_BUILDER_H
+#ifndef CVC4__NODE_BUILDER_H
+#define CVC4__NODE_BUILDER_H
 
 #include <cstdlib>
 #include <iostream>
@@ -274,7 +274,7 @@ class NodeBuilder {
    */
   inline void realloc() {
     size_t newSize = 2 * size_t(d_nvMaxChildren);
-    size_t hardLimit = (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1;
+    size_t hardLimit = (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1;
     realloc(__builtin_expect( ( newSize > hardLimit ), false ) ? hardLimit : newSize);
   }
 
@@ -774,9 +774,9 @@ template <unsigned nchild_thresh>
 void NodeBuilder<nchild_thresh>::realloc(size_t toSize) {
   Assert( toSize > d_nvMaxChildren,
           "attempt to realloc() a NodeBuilder to a smaller/equal size!" );
-  Assert( toSize < (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN),
+  Assert( toSize < (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN),
           "attempt to realloc() a NodeBuilder to size %u (beyond hard limit of %u)",
-          toSize, (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1 );
+          toSize, (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1 );
 
   if(__builtin_expect( ( nvIsAllocated() ), false )) {
     // Ensure d_nv is not modified on allocation failure
@@ -1342,4 +1342,4 @@ std::ostream& operator<<(std::ostream& out, const NodeBuilder<nchild_thresh>& nb
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__NODE_BUILDER_H */
+#endif /* CVC4__NODE_BUILDER_H */

diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h
index 30512c41ed8b34055326abe808191eb3f0b9e374..510e6d585f77625c937e1070cbb391cf1f4990bc 100644 (file)
--- a/src/expr/node_manager.h
+++ b/src/expr/node_manager.h
@@ -25,8 +25,8 @@
 #include "expr/expr.h"
 #include "expr/expr_manager.h"
 
-#ifndef __CVC4__NODE_MANAGER_H
-#define __CVC4__NODE_MANAGER_H
+#ifndef CVC4__NODE_MANAGER_H
+#define CVC4__NODE_MANAGER_H
 
 #include <vector>
 #include <string>
@@ -1215,9 +1215,9 @@ inline TypeNode NodeManager::fromType(Type t) {
 
 }/* CVC4 namespace */
 
-#define __CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
+#define CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
 #include "expr/metakind.h"
-#undef __CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
+#undef CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
 
 #include "expr/node_builder.h"
 
@@ -1559,4 +1559,4 @@ NodeClass NodeManager::mkConstInternal(const T& val) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__NODE_MANAGER_H */
+#endif /* CVC4__NODE_MANAGER_H */

diff --git a/src/expr/node_manager_listeners.h b/src/expr/node_manager_listeners.h
index 019a785d46dd193152b2dd416411abfa4a398bb3..501c6129fcb0eba37ca792eb0fde90248160417d 100644 (file)
--- a/src/expr/node_manager_listeners.h
+++ b/src/expr/node_manager_listeners.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__EXPR__NODE_MANAGER_LISTENERS_H
-#define __CVC4__EXPR__NODE_MANAGER_LISTENERS_H
+#ifndef CVC4__EXPR__NODE_MANAGER_LISTENERS_H
+#define CVC4__EXPR__NODE_MANAGER_LISTENERS_H
 
 #include "base/listener.h"
 #include "util/resource_manager.h"
@@ -64,4 +64,4 @@ class RlimitPerListener : public Listener {
 }/* CVC4::expr namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR__NODE_MANAGER_LISTENERS_H */
+#endif /* CVC4__EXPR__NODE_MANAGER_LISTENERS_H */

diff --git a/src/expr/node_self_iterator.h b/src/expr/node_self_iterator.h
index e81d4c52463754c75c7fc12292ff690f6f995f10..7e0478acc40e14bc915289e2f9a5d4835993c7c8 100644 (file)
--- a/src/expr/node_self_iterator.h
+++ b/src/expr/node_self_iterator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__EXPR__NODE_SELF_ITERATOR_H
-#define __CVC4__EXPR__NODE_SELF_ITERATOR_H
+#ifndef CVC4__EXPR__NODE_SELF_ITERATOR_H
+#define CVC4__EXPR__NODE_SELF_ITERATOR_H
 
 #include <iterator>
 
@@ -125,4 +125,4 @@ inline bool NodeSelfIterator::operator!=(NodeSelfIterator i) const {
 }/* CVC4::expr namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR__NODE_SELF_ITERATOR_H */
+#endif /* CVC4__EXPR__NODE_SELF_ITERATOR_H */

diff --git a/src/expr/node_trie.h b/src/expr/node_trie.h
index bc2e17ed06df41564f707fe30f8ffbcf04d31f94..7aa740a427c0eb1dccfde749fb1bcc393068885e 100644 (file)
--- a/src/expr/node_trie.h
+++ b/src/expr/node_trie.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__EXPR__NODE_TRIE_H
-#define __CVC4__EXPR__NODE_TRIE_H
+#ifndef CVC4__EXPR__NODE_TRIE_H
+#define CVC4__EXPR__NODE_TRIE_H
 
 #include <map>
 #include "expr/node.h"
@@ -109,4 +109,4 @@ typedef NodeTemplateTrie<false> TNodeTrie;
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__EXPR__NODE_TRIE_H */
+#endif /* CVC4__EXPR__NODE_TRIE_H */

diff --git a/src/expr/node_value.h b/src/expr/node_value.h
index 4881033cb1ee83abf0bd87a4b95f39c6375c8b44..024a13941726688ce37348f4cf3ca59d35e3153a 100644 (file)
--- a/src/expr/node_value.h
+++ b/src/expr/node_value.h
@@ -23,8 +23,8 @@
 // circular dependency
 #include "expr/metakind.h"
 
-#ifndef __CVC4__EXPR__NODE_VALUE_H
-#define __CVC4__EXPR__NODE_VALUE_H
+#ifndef CVC4__EXPR__NODE_VALUE_H
+#define CVC4__EXPR__NODE_VALUE_H
 
 #include <stdint.h>
 
@@ -59,10 +59,10 @@ namespace kind {
 
 namespace expr {
 
-#if __CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT + \
-    __CVC4__EXPR__NODE_VALUE__NBITS__KIND + \
-    __CVC4__EXPR__NODE_VALUE__NBITS__ID + \
-    __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN != 96
+#if CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT + \
+    CVC4__EXPR__NODE_VALUE__NBITS__KIND + \
+    CVC4__EXPR__NODE_VALUE__NBITS__ID + \
+    CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN != 96
 #  error NodeValue header bit assignment does not sum to 96 !
 #endif /* sum != 96 */
 
@@ -71,10 +71,10 @@ namespace expr {
  */
 class NodeValue {
 
-  static const unsigned NBITS_REFCOUNT = __CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT;
-  static const unsigned NBITS_KIND = __CVC4__EXPR__NODE_VALUE__NBITS__KIND;
-  static const unsigned NBITS_ID = __CVC4__EXPR__NODE_VALUE__NBITS__ID;
-  static const unsigned NBITS_NCHILDREN = __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN;
+  static const unsigned NBITS_REFCOUNT = CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT;
+  static const unsigned NBITS_KIND = CVC4__EXPR__NODE_VALUE__NBITS__KIND;
+  static const unsigned NBITS_ID = CVC4__EXPR__NODE_VALUE__NBITS__ID;
+  static const unsigned NBITS_NCHILDREN = CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN;
 
   /** Maximum reference count possible.  Used for sticky
    *  reference-counting.  Should be (1 << num_bits(d_rc)) - 1 */
@@ -549,4 +549,4 @@ static void __attribute__((used)) debugPrintRawNodeValue(const expr::NodeValue*
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR__NODE_VALUE_H */
+#endif /* CVC4__EXPR__NODE_VALUE_H */

diff --git a/src/expr/pickle_data.h b/src/expr/pickle_data.h
index af91fbbea2bdfc968b641defb4ddfea644e5c554..316b6285cb2a7d5e89764c0c9c2e70ea01fd31e5 100644 (file)
--- a/src/expr/pickle_data.h
+++ b/src/expr/pickle_data.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PICKLE_DATA_H
-#define __CVC4__PICKLE_DATA_H
+#ifndef CVC4__PICKLE_DATA_H
+#define CVC4__PICKLE_DATA_H
 
 #include <sstream>
 #include <deque>
@@ -44,8 +44,8 @@ namespace expr {
 namespace pickle {
 
 const unsigned NBITS_BLOCK = 64;
-const unsigned NBITS_KIND = __CVC4__EXPR__NODE_VALUE__NBITS__KIND;
-const unsigned NBITS_NCHILDREN = __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN;
+const unsigned NBITS_KIND = CVC4__EXPR__NODE_VALUE__NBITS__KIND;
+const unsigned NBITS_NCHILDREN = CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN;
 const unsigned NBITS_CONSTBLOCKS = 32;
 
 struct BlockHeader {
@@ -117,4 +117,4 @@ public:
 }/* CVC4::expr namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PICKLE_DATA_H */
+#endif /* CVC4__PICKLE_DATA_H */

diff --git a/src/expr/pickler.h b/src/expr/pickler.h
index f0d219eeb1cba755dae1ed90e5b3dff4d06068aa..02abdf18d110eedf4b062192bc979a898a8be674 100644 (file)
--- a/src/expr/pickler.h
+++ b/src/expr/pickler.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__PICKLER_H
-#define __CVC4__PICKLER_H
+#ifndef CVC4__PICKLER_H
+#define CVC4__PICKLER_H
 
 #include "expr/variable_type_map.h"
 #include "expr/expr.h"
@@ -126,4 +126,4 @@ protected:
 }/* CVC4::expr namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PICKLER_H */
+#endif /* CVC4__PICKLER_H */

diff --git a/src/expr/record.h b/src/expr/record.h
index 98fb5c10604b7ba4a1ca7e22907b12445d152f7f..bfa5d93957bdb144749c8025a7494b510b4524f5 100644 (file)
--- a/src/expr/record.h
+++ b/src/expr/record.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__RECORD_H
-#define __CVC4__RECORD_H
+#ifndef CVC4__RECORD_H
+#define CVC4__RECORD_H
 
 #include <functional>
 #include <iostream>
@@ -90,4 +90,4 @@ std::ostream& operator<<(std::ostream& os, const Record& r) CVC4_PUBLIC;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__RECORD_H */
+#endif /* CVC4__RECORD_H */

diff --git a/src/expr/symbol_table.h b/src/expr/symbol_table.h
index ec89dd8b334571cc17c45611b404a2b4e5832ae1..07f557059cbc2c93a4a67ed363692717c0abbd9d 100644 (file)
--- a/src/expr/symbol_table.h
+++ b/src/expr/symbol_table.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SYMBOL_TABLE_H
-#define __CVC4__SYMBOL_TABLE_H
+#ifndef CVC4__SYMBOL_TABLE_H
+#define CVC4__SYMBOL_TABLE_H
 
 #include <memory>
 #include <string>
@@ -246,4 +246,4 @@ class CVC4_PUBLIC SymbolTable {
 
 }  // namespace CVC4
 
-#endif /* __CVC4__SYMBOL_TABLE_H */
+#endif /* CVC4__SYMBOL_TABLE_H */

diff --git a/src/expr/type.h b/src/expr/type.h
index 943af234454ee4872a9df97b4fae1dab4d9eb3d0..2c68c9e73eaa41846f47505b644c823861d4f0d9 100644 (file)
--- a/src/expr/type.h
+++ b/src/expr/type.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__TYPE_H
-#define __CVC4__TYPE_H
+#ifndef CVC4__TYPE_H
+#define CVC4__TYPE_H
 
 #include <climits>
 #include <cstdint>
@@ -665,4 +665,4 @@ class CVC4_PUBLIC TesterType : public Type {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__TYPE_H */
+#endif /* CVC4__TYPE_H */

diff --git a/src/expr/type_checker.h b/src/expr/type_checker.h
index b88f6eb5c535ed37700f6ea7800e737a6fd44e63..8c03cea98dd921d4e5ac1a422bcb6ed29ac479fd 100644 (file)
--- a/src/expr/type_checker.h
+++ b/src/expr/type_checker.h
@@ -19,8 +19,8 @@
 // ordering dependence
 #include "expr/node.h"
 
-#ifndef __CVC4__EXPR__TYPE_CHECKER_H
-#define __CVC4__EXPR__TYPE_CHECKER_H
+#ifndef CVC4__EXPR__TYPE_CHECKER_H
+#define CVC4__EXPR__TYPE_CHECKER_H
 
 namespace CVC4 {
 namespace expr {
@@ -40,4 +40,4 @@ public:
 }/* CVC4::expr namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__EXPR__TYPE_CHECKER_H */
+#endif /* CVC4__EXPR__TYPE_CHECKER_H */

diff --git a/src/expr/type_node.h b/src/expr/type_node.h
index 6babc104dc696cb0430fb3f035c6a26e26ac1bc1..8ed26596bca0ec5059e308cfe0e3d5adbd9b6fef 100644 (file)
--- a/src/expr/type_node.h
+++ b/src/expr/type_node.h
@@ -19,8 +19,8 @@
 // circular dependency
 #include "expr/node_value.h"
 
-#ifndef __CVC4__TYPE_NODE_H
-#define __CVC4__TYPE_NODE_H
+#ifndef CVC4__TYPE_NODE_H
+#define CVC4__TYPE_NODE_H
 
 #include <stdint.h>
 
@@ -1072,4 +1072,4 @@ static void __attribute__((used)) debugPrintRawTypeNode(const TypeNode& n) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__NODE_H */
+#endif /* CVC4__NODE_H */

diff --git a/src/expr/type_properties_template.h b/src/expr/type_properties_template.h
index 8d596ddaa0ab9ec5df6d2f748426be33e0e3c4f2..88447a1259163cc0c10ff53decf61d0d679264ed 100644 (file)
--- a/src/expr/type_properties_template.h
+++ b/src/expr/type_properties_template.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__TYPE_PROPERTIES_H
-#define __CVC4__TYPE_PROPERTIES_H
+#ifndef CVC4__TYPE_PROPERTIES_H
+#define CVC4__TYPE_PROPERTIES_H
 
 #line 23 "${template}"
 
@@ -138,4 +138,4 @@ ${type_groundterms}
 }/* CVC4::kind namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__TYPE_PROPERTIES_H */
+#endif /* CVC4__TYPE_PROPERTIES_H */

diff --git a/src/expr/variable_type_map.h b/src/expr/variable_type_map.h
index fe0521991ff4518770146c8fde44d957772c944f..ba1c605499f04eab8e59ab002bfbb3f879015969 100644 (file)
--- a/src/expr/variable_type_map.h
+++ b/src/expr/variable_type_map.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__VARIABLE_TYPE_MAP_H
-#define __CVC4__VARIABLE_TYPE_MAP_H
+#ifndef CVC4__VARIABLE_TYPE_MAP_H
+#define CVC4__VARIABLE_TYPE_MAP_H
 
 #include <unordered_map>
 
@@ -60,4 +60,4 @@ struct CVC4_PUBLIC ExprManagerMapCollection {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__VARIABLE_MAP_H */
+#endif /* CVC4__VARIABLE_MAP_H */

diff --git a/src/include/cvc4.h b/src/include/cvc4.h
index 9f333298893640ed9ecd084bede957dd9716cdd7..86433731f84eb9fe76863e41245f633262ce574b 100644 (file)
--- a/src/include/cvc4.h
+++ b/src/include/cvc4.h
@@ -15,8 +15,8 @@
  ** most-commonly used CVC4 public-facing class interfaces.
  **/
 
-#ifndef __CVC4__CVC4_H
-#define __CVC4__CVC4_H
+#ifndef CVC4__CVC4_H
+#define CVC4__CVC4_H
 
 #include <cvc4/base/configuration.h>
 #include <cvc4/base/exception.h>
@@ -31,4 +31,4 @@
 #include <cvc4/util/integer.h>
 #include <cvc4/util/rational.h>
 
-#endif /* __CVC4__CVC4_H */
+#endif /* CVC4__CVC4_H */

diff --git a/src/include/cvc4_private.h b/src/include/cvc4_private.h
index 14b18e92265b3f1e2b9985b8257a2f1fa8042317..cadbbae3340db59de29feadaf4291c2ce3d3b7b9 100644 (file)
--- a/src/include/cvc4_private.h
+++ b/src/include/cvc4_private.h
@@ -16,8 +16,8 @@
  ** warning when the file is included improperly.
  **/
 
-#ifndef __CVC4_PRIVATE_H
-#define __CVC4_PRIVATE_H
+#ifndef CVC4_PRIVATE_H
+#define CVC4_PRIVATE_H
 
 #if ! (defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST))
 #  error A private CVC4 header was included when not building the library or private unit test code.
@@ -27,4 +27,4 @@
 #include "cvc4_public.h"
 #include "cvc4autoconfig.h"
 
-#endif /* __CVC4_PRIVATE_H */
+#endif /* CVC4_PRIVATE_H */

diff --git a/src/include/cvc4_private_library.h b/src/include/cvc4_private_library.h
index be020666fd2f8fed0d3f564561c480814da9272c..6c0c8f32439d33e2edc4633104f73fcce02976c2 100644 (file)
--- a/src/include/cvc4_private_library.h
+++ b/src/include/cvc4_private_library.h
@@ -16,8 +16,8 @@
  ** warning when the file is included improperly.
  **/
 
-#ifndef __CVC4_PRIVATE_LIBRARY_H
-#define __CVC4_PRIVATE_LIBRARY_H
+#ifndef CVC4_PRIVATE_LIBRARY_H
+#define CVC4_PRIVATE_LIBRARY_H
 
 #if !(defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST) \
       || defined(__BUILDING_CVC4PARSERLIB)                                 \
@@ -29,4 +29,4 @@
 #include "cvc4_public.h"
 #include "cvc4autoconfig.h"
 
-#endif /* __CVC4_PRIVATE_LIBRARY_H */
+#endif /* CVC4_PRIVATE_LIBRARY_H */

diff --git a/src/include/cvc4_public.h b/src/include/cvc4_public.h
index 307ba59740343564f9ab153884255bf2c14540e4..39b919f9feecc41c58822de5c5413086bc15c427 100644 (file)
--- a/src/include/cvc4_public.h
+++ b/src/include/cvc4_public.h
@@ -16,8 +16,8 @@
  ** the libraries and driver binary, and also exported to the user.
  **/
 
-#ifndef __CVC4_PUBLIC_H
-#define __CVC4_PUBLIC_H
+#ifndef CVC4_PUBLIC_H
+#define CVC4_PUBLIC_H
 
 #include <stdint.h>
 
@@ -52,4 +52,4 @@
 #  define CVC4_WARN_UNUSED_RESULT
 #endif /* __GNUC__ */
 
-#endif /* __CVC4_PUBLIC_H */
+#endif /* CVC4_PUBLIC_H */

diff --git a/src/lib/clock_gettime.h b/src/lib/clock_gettime.h
index 294722121458f75910b9ade0a6cbad3952cb2b58..d9382f5060bccc56b9d0a082e1a07f19e41522b9 100644 (file)
--- a/src/lib/clock_gettime.h
+++ b/src/lib/clock_gettime.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private_library.h"
 
-#ifndef __CVC4__LIB__CLOCK_GETTIME_H
-#define __CVC4__LIB__CLOCK_GETTIME_H
+#ifndef CVC4__LIB__CLOCK_GETTIME_H
+#define CVC4__LIB__CLOCK_GETTIME_H
 
 #include "lib/replacements.h"
 
@@ -72,4 +72,4 @@ long clock_gettime(clockid_t which_clock, struct timespec* tp);
 #endif /* __cplusplus */
 
 #endif /* HAVE_CLOCK_GETTIME */
-#endif /*__CVC4__LIB__CLOCK_GETTIME_H */
+#endif /*CVC4__LIB__CLOCK_GETTIME_H */

diff --git a/src/lib/ffs.h b/src/lib/ffs.h
index be34a98a37d88a2b42c54a709749c6ae79d57aba..ce7ecc2a122a671bc14fc56503456889333b9d53 100644 (file)
--- a/src/lib/ffs.h
+++ b/src/lib/ffs.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__LIB__FFS_H
-#define __CVC4__LIB__FFS_H
+#ifndef CVC4__LIB__FFS_H
+#define CVC4__LIB__FFS_H
 
 //We include this for HAVE_FFS
 #include "cvc4autoconfig.h"
@@ -42,4 +42,4 @@ int ffs(int i);
 #endif /* __cplusplus */
 
 #endif /* HAVE_FFS */
-#endif /* __CVC4__LIB__FFS_H */
+#endif /* CVC4__LIB__FFS_H */

diff --git a/src/lib/replacements.h b/src/lib/replacements.h
index 2a857a4ef6dea990ea179d7c76abaddd0a965354..fef6baa28aa0fbafd8496606c81d52d3bc5f8bfe 100644 (file)
--- a/src/lib/replacements.h
+++ b/src/lib/replacements.h
@@ -14,8 +14,8 @@
  ** Common header for replacement function sources.
  **/
 
-#ifndef __CVC4__LIB__REPLACEMENTS_H
-#define __CVC4__LIB__REPLACEMENTS_H
+#ifndef CVC4__LIB__REPLACEMENTS_H
+#define CVC4__LIB__REPLACEMENTS_H
 
 #if (defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST)) && !defined(__BUILDING_STATISTICS_FOR_EXPORT)
 #  include "cvc4_private.h"
@@ -31,4 +31,4 @@
 #  endif
 #endif
 
-#endif /* __CVC4__LIB__REPLACEMENTS_H */
+#endif /* CVC4__LIB__REPLACEMENTS_H */

diff --git a/src/lib/strtok_r.h b/src/lib/strtok_r.h
index 8243157b5eb0bc63b3c392fea96002a551bed67e..0640893c9b7e10d1137a40cd80a0fe24d03a3c41 100644 (file)
--- a/src/lib/strtok_r.h
+++ b/src/lib/strtok_r.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__LIB__STRTOK_R_H
-#define __CVC4__LIB__STRTOK_R_H
+#ifndef CVC4__LIB__STRTOK_R_H
+#define CVC4__LIB__STRTOK_R_H
 
 #ifdef HAVE_STRTOK_R
 
@@ -39,4 +39,4 @@ char* strtok_r(char *str, const char *delim, char **saveptr);
 #endif /* __cplusplus */
 
 #endif /* HAVE_STRTOK_R */
-#endif /* __CVC4__LIB__STRTOK_R_H */
+#endif /* CVC4__LIB__STRTOK_R_H */

diff --git a/src/main/command_executor.h b/src/main/command_executor.h
index dde36a453d21befe19f37afc97d10d56846ce0f9..c71f4d7a50e368b27fc5719df8b86f9e468d7b3c 100644 (file)
--- a/src/main/command_executor.h
+++ b/src/main/command_executor.h
@@ -12,8 +12,8 @@
  ** \brief An additional layer between commands and invoking them.
  **/
 
-#ifndef __CVC4__MAIN__COMMAND_EXECUTOR_H
-#define __CVC4__MAIN__COMMAND_EXECUTOR_H
+#ifndef CVC4__MAIN__COMMAND_EXECUTOR_H
+#define CVC4__MAIN__COMMAND_EXECUTOR_H
 
 #include <iosfwd>
 #include <string>
@@ -104,4 +104,4 @@ bool smtEngineInvoke(SmtEngine* smt, Command* cmd, std::ostream *out);
 }/* CVC4::main namespace */
 }/* CVC4 namespace */
 
-#endif  /* __CVC4__MAIN__COMMAND_EXECUTOR_H */
+#endif  /* CVC4__MAIN__COMMAND_EXECUTOR_H */

diff --git a/src/main/command_executor_portfolio.h b/src/main/command_executor_portfolio.h
index c35fdbcb199759b529d792ccbc8ef5b96989ef68..ef3329ef57d94b86052dad675bcbf130b4439838 100644 (file)
--- a/src/main/command_executor_portfolio.h
+++ b/src/main/command_executor_portfolio.h
@@ -15,8 +15,8 @@
  ** threads.
  **/
 
-#ifndef __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H
-#define __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H
+#ifndef CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H
+#define CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H
 
 #include "main/command_executor.h"
 #include "main/portfolio_util.h"
@@ -82,4 +82,4 @@ private:
 }/* CVC4::main namespace */
 }/* CVC4 namespace */
 
-#endif  /* __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H */
+#endif  /* CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H */

diff --git a/src/main/interactive_shell.h b/src/main/interactive_shell.h
index b2530dc3797da3e67e02b7930b35642395e2a592..7ed5a1c1fa95c20cae8e48e2f6228d76ce91da84 100644 (file)
--- a/src/main/interactive_shell.h
+++ b/src/main/interactive_shell.h
@@ -12,8 +12,8 @@
  ** \brief Interactive shell for CVC4
  **/
 
-#ifndef __CVC4__INTERACTIVE_SHELL_H
-#define __CVC4__INTERACTIVE_SHELL_H
+#ifndef CVC4__INTERACTIVE_SHELL_H
+#define CVC4__INTERACTIVE_SHELL_H
 
 #include <iosfwd>
 #include <string>
@@ -72,4 +72,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__INTERACTIVE_SHELL_H */
+#endif /* CVC4__INTERACTIVE_SHELL_H */

diff --git a/src/main/main.h b/src/main/main.h
index 3199273cbc022634ecdf6743d72b6e06ac6e0af7..266d043aa13978ef9c7755ce03f209c82f4f5b3d 100644 (file)
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -25,8 +25,8 @@
 #include "util/statistics.h"
 #include "util/statistics_registry.h"
 
-#ifndef __CVC4__MAIN__MAIN_H
-#define __CVC4__MAIN__MAIN_H
+#ifndef CVC4__MAIN__MAIN_H
+#define CVC4__MAIN__MAIN_H
 
 namespace CVC4 {
 namespace main {
@@ -70,4 +70,4 @@ void cvc4_shutdown() noexcept;
 int runCvc4(int argc, char* argv[], CVC4::Options&);
 void printUsage(CVC4::Options&, bool full = false);
 
-#endif /* __CVC4__MAIN__MAIN_H */
+#endif /* CVC4__MAIN__MAIN_H */

diff --git a/src/main/portfolio.h b/src/main/portfolio.h
index 54e38eb3d0a8d81ea6950802da6387be0927cb54..2cb23d5c5c01657e8f948640b493877ff28fbbd6 100644 (file)
--- a/src/main/portfolio.h
+++ b/src/main/portfolio.h
@@ -13,8 +13,8 @@
  ** (potentially cooperative) race
  **/
 
-#ifndef __CVC4__PORTFOLIO_H
-#define __CVC4__PORTFOLIO_H
+#ifndef CVC4__PORTFOLIO_H
+#define CVC4__PORTFOLIO_H
 
 #include <boost/function.hpp>
 #include <utility>
@@ -38,4 +38,4 @@ std::pair<int, S> runPortfolio(int numThreads,
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PORTFOLIO_H */
+#endif /* CVC4__PORTFOLIO_H */

diff --git a/src/main/portfolio_util.h b/src/main/portfolio_util.h
index ab5f26f90ae5c2e75ecbb3465726e7ea68e69ad8..e5ca296aebd11715c69e07c7f693128e76265987 100644 (file)
--- a/src/main/portfolio_util.h
+++ b/src/main/portfolio_util.h
@@ -12,8 +12,8 @@
  ** \brief Code relevant only for portfolio builds
  **/
 
-#ifndef __CVC4__PORTFOLIO_UTIL_H
-#define __CVC4__PORTFOLIO_UTIL_H
+#ifndef CVC4__PORTFOLIO_UTIL_H
+#define CVC4__PORTFOLIO_UTIL_H
 
 #include <queue>
 
@@ -177,4 +177,4 @@ void sharingManager(unsigned numThreads,
 
 }/* CVC4 namespace */
 
-#endif   /* __CVC4__PORTFOLIO_UTIL_H */
+#endif   /* CVC4__PORTFOLIO_UTIL_H */

diff --git a/src/options/argument_extender.h b/src/options/argument_extender.h
index 5ba8d09d02d9c8159b8b52b777c9af6d01d20250..e3cec3c258e6db722af21af7411e5281ad0c0851 100644 (file)
--- a/src/options/argument_extender.h
+++ b/src/options/argument_extender.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__OPTIONS__ARGUMENT_EXTENDER_H
-#define __CVC4__OPTIONS__ARGUMENT_EXTENDER_H
+#ifndef CVC4__OPTIONS__ARGUMENT_EXTENDER_H
+#define CVC4__OPTIONS__ARGUMENT_EXTENDER_H
 
 #include <cstddef>
 
@@ -82,4 +82,4 @@ public:
 }/* CVC4::options namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__OPTIONS__ARGUMENT_EXTENDER_H */
+#endif /* CVC4__OPTIONS__ARGUMENT_EXTENDER_H */

diff --git a/src/options/argument_extender_implementation.h b/src/options/argument_extender_implementation.h
index 33a7ee78e06684755e0e9ac665991ad8c6d44a12..9906bb420eebca5df35d10e3a02d79557b87c415 100644 (file)
--- a/src/options/argument_extender_implementation.h
+++ b/src/options/argument_extender_implementation.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H
-#define __CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H
+#ifndef CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H
+#define CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H
 
 #include <cstddef>
 #include <list>
@@ -112,4 +112,4 @@ class ArgumentExtenderImplementation : public ArgumentExtender {
 }/* CVC4::options namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H */
+#endif /* CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H */

diff --git a/src/options/arith_heuristic_pivot_rule.h b/src/options/arith_heuristic_pivot_rule.h
index 7e27a0513a682a1faa6aa841a24db94cdeeeb19f..2caa21043346a7b0dfa521c63730917e78860804 100644 (file)
--- a/src/options/arith_heuristic_pivot_rule.h
+++ b/src/options/arith_heuristic_pivot_rule.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H
-#define __CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H
+#ifndef CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H
+#define CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H
 
 #include <iostream>
 
@@ -35,4 +35,4 @@ std::ostream& operator<<(std::ostream& out, ErrorSelectionRule rule) CVC4_PUBLIC
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H */
+#endif /* CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H */

diff --git a/src/options/arith_propagation_mode.h b/src/options/arith_propagation_mode.h
index fbbef3f963109b71a0acefea3809cdd298a47483..b2c6b4c61281a2a11ca7220f0bc93c1d645bcbe2 100644 (file)
--- a/src/options/arith_propagation_mode.h
+++ b/src/options/arith_propagation_mode.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H
-#define __CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H
+#ifndef CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H
+#define CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H
 
 #include <iostream>
 
@@ -35,4 +35,4 @@ std::ostream& operator<<(std::ostream& out, ArithPropagationMode rule) CVC4_PUBL
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H */
+#endif /* CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H */

diff --git a/src/options/arith_unate_lemma_mode.h b/src/options/arith_unate_lemma_mode.h
index f626dad65a71f51548fb207f0b0f38f4afc2eb93..a917b83fd29fc9c9f71410f7f52de662f1016ba3 100644 (file)
--- a/src/options/arith_unate_lemma_mode.h
+++ b/src/options/arith_unate_lemma_mode.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H
-#define __CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H
+#ifndef CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H
+#define CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H
 
 #include <iostream>
 
@@ -35,4 +35,4 @@ std::ostream& operator<<(std::ostream& out, ArithUnateLemmaMode rule) CVC4_PUBLI
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H */
+#endif /* CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H */

diff --git a/src/options/base_handlers.h b/src/options/base_handlers.h
index 58c963145ac63a9d6564e221f5152142c8d28c82..fae6549f3e6e0ea4fa463735612ee9ee34125f7c 100644 (file)
--- a/src/options/base_handlers.h
+++ b/src/options/base_handlers.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BASE_HANDLERS_H
-#define __CVC4__BASE_HANDLERS_H
+#ifndef CVC4__BASE_HANDLERS_H
+#define CVC4__BASE_HANDLERS_H
 
 #include <iostream>
 #include <string>
@@ -83,4 +83,4 @@ struct not_equal : public comparator<std::not_equal_to> {
 }/* CVC4::options namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BASE_HANDLERS_H */
+#endif /* CVC4__BASE_HANDLERS_H */

diff --git a/src/options/bool_to_bv_mode.h b/src/options/bool_to_bv_mode.h
index e4506087262763f62c09b70bf88e59fe7e8e45af..2dbd723c99d6dc7ab649ccb8485b6eea160011ce 100644 (file)
--- a/src/options/bool_to_bv_mode.h
+++ b/src/options/bool_to_bv_mode.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H
-#define __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H
+#ifndef CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H
+#define CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H
 
 #include <iosfwd>
 
@@ -54,4 +54,4 @@ std::ostream& operator<<(std::ostream& out, preprocessing::passes::BoolToBVMode
 
 }
 
-#endif /* __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H */
+#endif /* CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H */

diff --git a/src/options/bv_bitblast_mode.h b/src/options/bv_bitblast_mode.h
index 270f2346d9fdc09a27de0009e10f59735274f972..7243c38e1ebf32dd101776ac42cb17a6d6dc482c 100644 (file)
--- a/src/options/bv_bitblast_mode.h
+++ b/src/options/bv_bitblast_mode.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BITBLAST_MODE_H
-#define __CVC4__THEORY__BV__BITBLAST_MODE_H
+#ifndef CVC4__THEORY__BV__BITBLAST_MODE_H
+#define CVC4__THEORY__BV__BITBLAST_MODE_H
 
 #include <iosfwd>
 
@@ -120,4 +120,4 @@ std::ostream& operator<<(std::ostream& out, theory::bv::BvOptimizeSatProof level
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BV__BITBLAST_MODE_H */
+#endif /* CVC4__THEORY__BV__BITBLAST_MODE_H */

diff --git a/src/options/datatypes_modes.h b/src/options/datatypes_modes.h
index 23ff0651dcc76af0d141b61f9599cbcc1859fd88..8d7ced9e2116f0c01e17826b7091831569251590 100644 (file)
--- a/src/options/datatypes_modes.h
+++ b/src/options/datatypes_modes.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__BASE__DATATYPES_MODES_H
-#define __CVC4__BASE__DATATYPES_MODES_H
+#ifndef CVC4__BASE__DATATYPES_MODES_H
+#define CVC4__BASE__DATATYPES_MODES_H
 
 #include <iostream>
 
@@ -41,4 +41,4 @@ enum SygusFairMode {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BASE__DATATYPES_MODES_H */
+#endif /* CVC4__BASE__DATATYPES_MODES_H */

diff --git a/src/options/decision_mode.h b/src/options/decision_mode.h
index 9f653bf2750f9557d1ebf27a9abfa80207f17b43..c90e0a6f01d916f29ca00c9b1008602f13a02493 100644 (file)
--- a/src/options/decision_mode.h
+++ b/src/options/decision_mode.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SMT__DECISION_MODE_H
-#define __CVC4__SMT__DECISION_MODE_H
+#ifndef CVC4__SMT__DECISION_MODE_H
+#define CVC4__SMT__DECISION_MODE_H
 
 #include <iosfwd>
 
@@ -61,4 +61,4 @@ std::ostream& operator<<(std::ostream& out, decision::DecisionMode mode);
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT__DECISION_MODE_H */
+#endif /* CVC4__SMT__DECISION_MODE_H */

diff --git a/src/options/decision_weight.h b/src/options/decision_weight.h
index 95afd53c318c79ac86e9a76366b97ee335fad32d..16c12a3b49eb9df9f2ed9d10b04b9f851eec62a6 100644 (file)
--- a/src/options/decision_weight.h
+++ b/src/options/decision_weight.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__OPTIONS__DECISION_WEIGHT_H
-#define __CVC4__OPTIONS__DECISION_WEIGHT_H
+#ifndef CVC4__OPTIONS__DECISION_WEIGHT_H
+#define CVC4__OPTIONS__DECISION_WEIGHT_H
 
 namespace CVC4 {
 namespace decision {
@@ -27,4 +27,4 @@ typedef uint64_t DecisionWeight;
 }/* CVC4::decision namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__OPTIONS__DECISION_WEIGHT_H */
+#endif /* CVC4__OPTIONS__DECISION_WEIGHT_H */

diff --git a/src/options/language.h b/src/options/language.h
index f40b1960a3d1ba218002582cb4327cc9f129de9f..4d213c30546724176586b3a2d0de69c91e2fd0e4 100644 (file)
--- a/src/options/language.h
+++ b/src/options/language.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__LANGUAGE_H
-#define __CVC4__LANGUAGE_H
+#ifndef CVC4__LANGUAGE_H
+#define CVC4__LANGUAGE_H
 
 #include <sstream>
 #include <string>
@@ -232,4 +232,4 @@ OutputLanguage toOutputLanguage(std::string language) CVC4_PUBLIC;
 }/* CVC4::language namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__LANGUAGE_H */
+#endif /* CVC4__LANGUAGE_H */

diff --git a/src/options/module_template.h b/src/options/module_template.h
index b61dd95e7071d44afc0fe256dfd51b5c9b061104..2ffe070d2ff6a974f7cab7e19d770f03c9a7813e 100644 (file)
--- a/src/options/module_template.h
+++ b/src/options/module_template.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__OPTIONS__${id}$_H
-#define __CVC4__OPTIONS__${id}$_H
+#ifndef CVC4__OPTIONS__${id}$_H
+#define CVC4__OPTIONS__${id}$_H
 
 #include "options/options.h"
 
@@ -48,4 +48,4 @@ ${inls}$
 }  // namespace options
 }  // namespace CVC4
 
-#endif /* __CVC4__OPTIONS__${id}$_H */
+#endif /* CVC4__OPTIONS__${id}$_H */

diff --git a/src/options/open_ostream.h b/src/options/open_ostream.h
index 0334b2cbc3fa8b392df6acca5e762ccb326a04cd..592db925f58b2188c9c02c39aae7b6dc5694a1b4 100644 (file)
--- a/src/options/open_ostream.h
+++ b/src/options/open_ostream.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__OPEN_OSTREAM_H
-#define __CVC4__OPEN_OSTREAM_H
+#ifndef CVC4__OPEN_OSTREAM_H
+#define CVC4__OPEN_OSTREAM_H
 
 #include <map>
 #include <ostream>
@@ -59,4 +59,4 @@ std::string cvc4_errno_failreason();
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__OPEN_OSTREAM_H */
+#endif /* CVC4__OPEN_OSTREAM_H */

diff --git a/src/options/option_exception.h b/src/options/option_exception.h
index 41f850483322c79740dcf3b52754c4029f5dc1d6..d337d4c9bc7c5b521911b1f597185b00b9589259 100644 (file)
--- a/src/options/option_exception.h
+++ b/src/options/option_exception.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__OPTION_EXCEPTION_H
-#define __CVC4__OPTION_EXCEPTION_H
+#ifndef CVC4__OPTION_EXCEPTION_H
+#define CVC4__OPTION_EXCEPTION_H
 
 #include "base/exception.h"
 
@@ -64,4 +64,4 @@ class CVC4_PUBLIC UnrecognizedOptionException : public CVC4::OptionException {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__OPTION_EXCEPTION_H */
+#endif /* CVC4__OPTION_EXCEPTION_H */

diff --git a/src/options/options.h b/src/options/options.h
index 3767bb8fd58c8755bdf5866247b8f91d118353c2..3f2d72b7e82627c0ebec4365ee7d75c0a3941cb3 100644 (file)
--- a/src/options/options.h
+++ b/src/options/options.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__OPTIONS__OPTIONS_H
-#define __CVC4__OPTIONS__OPTIONS_H
+#ifndef CVC4__OPTIONS__OPTIONS_H
+#define CVC4__OPTIONS__OPTIONS_H
 
 #include <fstream>
 #include <ostream>
@@ -560,4 +560,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__OPTIONS__OPTIONS_H */
+#endif /* CVC4__OPTIONS__OPTIONS_H */

diff --git a/src/options/options_handler.h b/src/options/options_handler.h
index 5c354be570fe1c287806807911535ce211bdcd5c..06f7ab6e42b6fbc63dccf42c5d244fb914de6e90 100644 (file)
--- a/src/options/options_handler.h
+++ b/src/options/options_handler.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__OPTIONS__OPTIONS_HANDLER_H
-#define __CVC4__OPTIONS__OPTIONS_HANDLER_H
+#ifndef CVC4__OPTIONS__OPTIONS_HANDLER_H
+#define CVC4__OPTIONS__OPTIONS_HANDLER_H
 
 #include <ostream>
 #include <string>
@@ -286,4 +286,4 @@ public:
 }/* CVC4::options namespace */
 }/* CVC4 namespace */
 
-#endif /*  __CVC4__OPTIONS__OPTIONS_HANDLER_H */
+#endif /*  CVC4__OPTIONS__OPTIONS_HANDLER_H */

diff --git a/src/options/options_holder_template.h b/src/options/options_holder_template.h
index 877fc6cdb3624386cc1bcb91d763a89a727dc50c..4cd77a441f55975a57c8dff295e7116cff981c3b 100644 (file)
--- a/src/options/options_holder_template.h
+++ b/src/options/options_holder_template.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__OPTIONS__OPTIONS_HOLDER_H
-#define __CVC4__OPTIONS__OPTIONS_HOLDER_H
+#ifndef CVC4__OPTIONS__OPTIONS_HOLDER_H
+#define CVC4__OPTIONS__OPTIONS_HOLDER_H
 
 ${headers_module}$
 
@@ -35,4 +35,4 @@ struct OptionsHolder {
 }  // namespace options
 }  // namespace CVC4
 
-#endif /* __CVC4__OPTIONS__OPTIONS_HOLDER_H */
+#endif /* CVC4__OPTIONS__OPTIONS_HOLDER_H */

diff --git a/src/options/printer_modes.h b/src/options/printer_modes.h
index 5160a2b47565d19058a8b23dd07ee5708bc1c574..79c57828bc737243447f36ca0595d1f621696f82 100644 (file)
--- a/src/options/printer_modes.h
+++ b/src/options/printer_modes.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__PRINTER__MODES_H
-#define __CVC4__PRINTER__MODES_H
+#ifndef CVC4__PRINTER__MODES_H
+#define CVC4__PRINTER__MODES_H
 
 #include <iostream>
 
@@ -45,4 +45,4 @@ std::ostream& operator<<(std::ostream& out, InstFormatMode mode) CVC4_PUBLIC;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PRINTER__MODEL_FORMAT_H */
+#endif /* CVC4__PRINTER__MODEL_FORMAT_H */

diff --git a/src/options/quantifiers_modes.h b/src/options/quantifiers_modes.h
index 1562693cb3fea755fdd6b56d06625a7523a5e16d..c9aeda154bb5f171a4a64ec257fb11b623bb0666 100644 (file)
--- a/src/options/quantifiers_modes.h
+++ b/src/options/quantifiers_modes.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__BASE__QUANTIFIERS_MODES_H
-#define __CVC4__BASE__QUANTIFIERS_MODES_H
+#ifndef CVC4__BASE__QUANTIFIERS_MODES_H
+#define CVC4__BASE__QUANTIFIERS_MODES_H
 
 #include <iostream>
 
@@ -316,4 +316,4 @@ std::ostream& operator<<(std::ostream& out, theory::quantifiers::InstWhenMode mo
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BASE__QUANTIFIERS_MODES_H */
+#endif /* CVC4__BASE__QUANTIFIERS_MODES_H */

diff --git a/src/options/set_language.h b/src/options/set_language.h
index 18574072825d56b6679535721a1e11a8683975fe..0e3b32dd71bd6dbf3f5bcc89c865f10645029eed 100644 (file)
--- a/src/options/set_language.h
+++ b/src/options/set_language.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__OPTIONS__SET_LANGUAGE_H
-#define __CVC4__OPTIONS__SET_LANGUAGE_H
+#ifndef CVC4__OPTIONS__SET_LANGUAGE_H
+#define CVC4__OPTIONS__SET_LANGUAGE_H
 
 #include <iostream>
 #include "options/language.h"
@@ -96,4 +96,4 @@ std::ostream& operator<<(std::ostream& out, SetLanguage l) CVC4_PUBLIC;
 }/* CVC4::language namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__OPTIONS__SET_LANGUAGE_H */
+#endif /* CVC4__OPTIONS__SET_LANGUAGE_H */

diff --git a/src/options/smt_modes.h b/src/options/smt_modes.h
index aebe0ade47bf4af3801bdb2eb8a586c6097414d2..ed40a28a187a8b7bb0e3832abfd3823e2f524573 100644 (file)
--- a/src/options/smt_modes.h
+++ b/src/options/smt_modes.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SMT__MODES_H
-#define __CVC4__SMT__MODES_H
+#ifndef CVC4__SMT__MODES_H
+#define CVC4__SMT__MODES_H
 
 #include <iosfwd>
 
@@ -55,4 +55,4 @@ enum ModelCoresMode
 
 }  // namespace CVC4
 
-#endif /* __CVC4__SMT__MODES_H */
+#endif /* CVC4__SMT__MODES_H */

diff --git a/src/options/strings_process_loop_mode.h b/src/options/strings_process_loop_mode.h
index 2933e034f7e0e34a7d17b9c734b7a4e49918c135..fb2248eec014c4891951b7d9fa29e1a5d3ac8f7b 100644 (file)
--- a/src/options/strings_process_loop_mode.h
+++ b/src/options/strings_process_loop_mode.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__PROCESS_LOOP_MODE_H
-#define __CVC4__THEORY__STRINGS__PROCESS_LOOP_MODE_H
+#ifndef CVC4__THEORY__STRINGS__PROCESS_LOOP_MODE_H
+#define CVC4__THEORY__STRINGS__PROCESS_LOOP_MODE_H
 
 #include <iosfwd>
 
@@ -52,4 +52,4 @@ std::ostream& operator<<(std::ostream& out,
 
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__BV__BITBLAST_MODE_H */
+#endif /* CVC4__THEORY__BV__BITBLAST_MODE_H */

diff --git a/src/options/sygus_out_mode.h b/src/options/sygus_out_mode.h
index 5222d60ba2613246755d2677965b01463a5e649b..79480946a5c0f69487abeb1fa0965c60a9271989 100644 (file)
--- a/src/options/sygus_out_mode.h
+++ b/src/options/sygus_out_mode.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SMT__SYGUS_OUT_MODE_H
-#define __CVC4__SMT__SYGUS_OUT_MODE_H
+#ifndef CVC4__SMT__SYGUS_OUT_MODE_H
+#define CVC4__SMT__SYGUS_OUT_MODE_H
 
 #include <iosfwd>
 
@@ -36,4 +36,4 @@ enum SygusSolutionOutMode
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__SMT__SYGUS_OUT_MODE_H */
+#endif /* CVC4__SMT__SYGUS_OUT_MODE_H */

diff --git a/src/options/ufss_mode.h b/src/options/ufss_mode.h
index a03d46c0700b35764f26581f98e670d69e2ec387..d6a106ecf564f297ae85230fe556eeabd5f9209e 100644 (file)
--- a/src/options/ufss_mode.h
+++ b/src/options/ufss_mode.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BASE__UFSS_MODE_H
-#define __CVC4__BASE__UFSS_MODE_H
+#ifndef CVC4__BASE__UFSS_MODE_H
+#define CVC4__BASE__UFSS_MODE_H
 
 namespace CVC4 {
 namespace theory {
@@ -36,4 +36,4 @@ enum UfssMode{
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BASE__UFSS_MODE_H */
+#endif /* CVC4__BASE__UFSS_MODE_H */

diff --git a/src/parser/antlr_input.h b/src/parser/antlr_input.h
index 17e21e21fd7e74616a359bfa109c4437ec3e8864..9c53e03493ac9db850a1f378d0bd64e048e5e5a6 100644 (file)
--- a/src/parser/antlr_input.h
+++ b/src/parser/antlr_input.h
@@ -14,8 +14,8 @@
  ** Base for ANTLR parser classes.
  **/
 
-#ifndef __CVC4__PARSER__ANTLR_INPUT_H
-#define __CVC4__PARSER__ANTLR_INPUT_H
+#ifndef CVC4__PARSER__ANTLR_INPUT_H
+#define CVC4__PARSER__ANTLR_INPUT_H
 
 #include "cvc4parser_private.h"
 
@@ -299,4 +299,4 @@ inline BitVector AntlrInput::tokenToBitvector(pANTLR3_COMMON_TOKEN number, pANTL
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__ANTLR_INPUT_H */
+#endif /* CVC4__PARSER__ANTLR_INPUT_H */

diff --git a/src/parser/antlr_line_buffered_input.h b/src/parser/antlr_line_buffered_input.h
index 3a1843ee537fcfb263b5a910ee99405eea965e4f..34cb72f1e7819c75b4992b36a348f32e299bf681 100644 (file)
--- a/src/parser/antlr_line_buffered_input.h
+++ b/src/parser/antlr_line_buffered_input.h
@@ -22,8 +22,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H
-#define __CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H
+#ifndef CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H
+#define CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H
 
 #include <antlr3.h>
 #include <istream>
@@ -47,4 +47,4 @@ pANTLR3_INPUT_STREAM antlr3LineBufferedStreamNew(std::istream& in,
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H */
+#endif /* CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H */

diff --git a/src/parser/antlr_tracing.h b/src/parser/antlr_tracing.h
index 77d16aedbcb73ab6baa1f1518438adf73ebc2ae9..d2eb742c2e7ff4050858177b7adae40cbdec75d5 100644 (file)
--- a/src/parser/antlr_tracing.h
+++ b/src/parser/antlr_tracing.h
@@ -15,8 +15,8 @@
  ** \todo document this file
  **/
 
-#ifndef __CVC4__PARSER__ANTLR_TRACING_H
-#define __CVC4__PARSER__ANTLR_TRACING_H
+#ifndef CVC4__PARSER__ANTLR_TRACING_H
+#define CVC4__PARSER__ANTLR_TRACING_H
 
 // only enable the hack with -DCVC4_TRACE_ANTLR
 #ifdef CVC4_TRACE_ANTLR
@@ -83,4 +83,4 @@ static struct __Cvc4System {
 
 #endif /* CVC4_TRACE_ANTLR */
 
-#endif /* __CVC4__PARSER__ANTLR_TRACING_H */
+#endif /* CVC4__PARSER__ANTLR_TRACING_H */

diff --git a/src/parser/bounded_token_buffer.h b/src/parser/bounded_token_buffer.h
index 3258441b8129f9ecdcc43f3af3b4c4c0a5f42cc9..8afe6864a641ee2e9468c9a90f27a82f5040e142 100644 (file)
--- a/src/parser/bounded_token_buffer.h
+++ b/src/parser/bounded_token_buffer.h
@@ -25,8 +25,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef        __CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H
-#define        __CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H
+#ifndef        CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H
+#define        CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H
 
 #include <antlr3defs.h>
 
@@ -61,4 +61,4 @@ BoundedTokenBufferFree(pBOUNDED_TOKEN_BUFFER buffer);
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H */
+#endif /* CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H */

diff --git a/src/parser/bounded_token_factory.h b/src/parser/bounded_token_factory.h
index f44218786a90390de9c455cd171516fdee06618a..f2df9ac3614ce9a8619ddb8fcde1711b6b1a01d0 100644 (file)
--- a/src/parser/bounded_token_factory.h
+++ b/src/parser/bounded_token_factory.h
@@ -19,8 +19,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H
-#define __CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H
+#ifndef CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H
+#define CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H
 
 namespace CVC4 {
 namespace parser {
@@ -48,4 +48,4 @@ BoundedTokenFactoryNew(pANTLR3_INPUT_STREAM input,ANTLR3_UINT32 size);
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H */
+#endif /* CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H */

diff --git a/src/parser/cvc/cvc_input.h b/src/parser/cvc/cvc_input.h
index 944a125c2a8775e9e7a844a542811bb60b34b64d..098efd58056ea61dc5642c7ee83c0804812efdc8 100644 (file)
--- a/src/parser/cvc/cvc_input.h
+++ b/src/parser/cvc/cvc_input.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__CVC_INPUT_H
-#define __CVC4__PARSER__CVC_INPUT_H
+#ifndef CVC4__PARSER__CVC_INPUT_H
+#define CVC4__PARSER__CVC_INPUT_H
 
 #include "parser/antlr_input.h"
 #include "parser/cvc/CvcLexer.h"
@@ -74,4 +74,4 @@ class CvcInput : public AntlrInput {
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__CVC_INPUT_H */
+#endif /* CVC4__PARSER__CVC_INPUT_H */

diff --git a/src/parser/input.h b/src/parser/input.h
index c8d6bbb0e930c72b2077067c86d8de0fbd5106aa..5627dc15e7eba4d43ffb1254c981f803a3c03412 100644 (file)
--- a/src/parser/input.h
+++ b/src/parser/input.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_public.h"
 
-#ifndef __CVC4__PARSER__INPUT_H
-#define __CVC4__PARSER__INPUT_H
+#ifndef CVC4__PARSER__INPUT_H
+#define CVC4__PARSER__INPUT_H
 
 #include <iostream>
 #include <stdio.h>
@@ -178,4 +178,4 @@ class CVC4_PUBLIC Input {
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__ANTLR_INPUT_H */
+#endif /* CVC4__PARSER__ANTLR_INPUT_H */

diff --git a/src/parser/line_buffer.h b/src/parser/line_buffer.h
index d493ed7ae91b04a6cd43b96b18a9f32d1a06e598..e8ab05691c74627da9a4e224bd89c37b6ba4c8de 100644 (file)
--- a/src/parser/line_buffer.h
+++ b/src/parser/line_buffer.h
@@ -18,8 +18,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__LINE_BUFFER_H
-#define __CVC4__PARSER__LINE_BUFFER_H
+#ifndef CVC4__PARSER__LINE_BUFFER_H
+#define CVC4__PARSER__LINE_BUFFER_H
 
 #include <cstdlib>
 #include <istream>
@@ -73,4 +73,4 @@ class LineBuffer {
 }  // namespace parser
 }  // namespace CVC4
 
-#endif /* __CVC4__PARSER__LINE_BUFFER_H */
+#endif /* CVC4__PARSER__LINE_BUFFER_H */

diff --git a/src/parser/memory_mapped_input_buffer.h b/src/parser/memory_mapped_input_buffer.h
index efa739912cc57832930043570b7a31057efb0399..ee143c6b38d01d87c239f1a62b6009487c68028a 100644 (file)
--- a/src/parser/memory_mapped_input_buffer.h
+++ b/src/parser/memory_mapped_input_buffer.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H
-#define __CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H
+#ifndef CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H
+#define CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H
 
 #include <antlr3input.h>
 #include <string>
@@ -39,4 +39,4 @@ MemoryMappedInputBufferNew(const std::string& filename);
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H */
+#endif /* CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H */

diff --git a/src/parser/parser.h b/src/parser/parser.h
index 8bdc28d1596c406c00fc77c86e01fa86b3c536a7..826d460b2f13c14d1982ab9b4b4b280e16614a54 100644 (file)
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_public.h"
 
-#ifndef __CVC4__PARSER__PARSER_STATE_H
-#define __CVC4__PARSER__PARSER_STATE_H
+#ifndef CVC4__PARSER__PARSER_STATE_H
+#define CVC4__PARSER__PARSER_STATE_H
 
 #include <string>
 #include <set>
@@ -835,4 +835,4 @@ public:
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__PARSER_STATE_H */
+#endif /* CVC4__PARSER__PARSER_STATE_H */

diff --git a/src/parser/parser_builder.h b/src/parser/parser_builder.h
index 3f48b0bdb9a9c971d7bd9a4aab04e83aa7b20d67..1a9ca719e5441852ff47645d8405979e2358973d 100644 (file)
--- a/src/parser/parser_builder.h
+++ b/src/parser/parser_builder.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_public.h"
 
-#ifndef __CVC4__PARSER__PARSER_BUILDER_H
-#define __CVC4__PARSER__PARSER_BUILDER_H
+#ifndef CVC4__PARSER__PARSER_BUILDER_H
+#define CVC4__PARSER__PARSER_BUILDER_H
 
 #include <string>
 
@@ -180,4 +180,4 @@ class CVC4_PUBLIC ParserBuilder {
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__PARSER_BUILDER_H */
+#endif /* CVC4__PARSER__PARSER_BUILDER_H */

diff --git a/src/parser/parser_exception.h b/src/parser/parser_exception.h
index 5e7e2500ec94a92fdb1ce8e7d237d5e4c6c08e6f..cd5e162d242385f6d93d4b96c7c5e672dc184276 100644 (file)
--- a/src/parser/parser_exception.h
+++ b/src/parser/parser_exception.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_public.h"
 
-#ifndef __CVC4__PARSER__PARSER_EXCEPTION_H
-#define __CVC4__PARSER__PARSER_EXCEPTION_H
+#ifndef CVC4__PARSER__PARSER_EXCEPTION_H
+#define CVC4__PARSER__PARSER_EXCEPTION_H
 
 #include <iostream>
 #include <string>
@@ -99,4 +99,4 @@ class CVC4_PUBLIC ParserEndOfFileException : public ParserException {
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__PARSER_EXCEPTION_H */
+#endif /* CVC4__PARSER__PARSER_EXCEPTION_H */

diff --git a/src/parser/smt1/smt1.h b/src/parser/smt1/smt1.h
index f8a018806dee9d851e3dd632af8ca0925eab0292..32867e692fd2b40a686b6e400870468851dfbcb8 100644 (file)
--- a/src/parser/smt1/smt1.h
+++ b/src/parser/smt1/smt1.h
@@ -14,8 +14,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__SMT1_H
-#define __CVC4__PARSER__SMT1_H
+#ifndef CVC4__PARSER__SMT1_H
+#define CVC4__PARSER__SMT1_H
 
 #include <string>
 #include <unordered_map>
@@ -130,4 +130,4 @@ private:
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__SMT1_H */
+#endif /* CVC4__PARSER__SMT1_H */

diff --git a/src/parser/smt1/smt1_input.h b/src/parser/smt1/smt1_input.h
index 511ddfd53fbab5f1b1a63e6defe988265eb518d7..fcdc63ee2079a480ed58c85758c105f19e98dfe9 100644 (file)
--- a/src/parser/smt1/smt1_input.h
+++ b/src/parser/smt1/smt1_input.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__SMT1_INPUT_H
-#define __CVC4__PARSER__SMT1_INPUT_H
+#ifndef CVC4__PARSER__SMT1_INPUT_H
+#define CVC4__PARSER__SMT1_INPUT_H
 
 #include "parser/antlr_input.h"
 #include "parser/smt1/Smt1Lexer.h"
@@ -82,4 +82,4 @@ public:
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__SMT1_INPUT_H */
+#endif /* CVC4__PARSER__SMT1_INPUT_H */

diff --git a/src/parser/smt2/smt2.h b/src/parser/smt2/smt2.h
index 7a3c3b0c312b8afc1c394309b7f38e9a92926613..ee694db06fc55af700abb32f82f120fa6467eaae 100644 (file)
--- a/src/parser/smt2/smt2.h
+++ b/src/parser/smt2/smt2.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__SMT2_H
-#define __CVC4__PARSER__SMT2_H
+#ifndef CVC4__PARSER__SMT2_H
+#define CVC4__PARSER__SMT2_H
 
 #include <sstream>
 #include <stack>
@@ -414,4 +414,4 @@ private:
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__SMT2_H */
+#endif /* CVC4__PARSER__SMT2_H */

diff --git a/src/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h
index a456a33f8f862e880275949ecab170547be13302..e8b736a16161de74c02a89b78ecfa5e1a4e6b18f 100644 (file)
--- a/src/parser/smt2/smt2_input.h
+++ b/src/parser/smt2/smt2_input.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__SMT2_INPUT_H
-#define __CVC4__PARSER__SMT2_INPUT_H
+#ifndef CVC4__PARSER__SMT2_INPUT_H
+#define CVC4__PARSER__SMT2_INPUT_H
 
 #include "parser/antlr_input.h"
 #include "parser/smt2/Smt2Lexer.h"
@@ -83,4 +83,4 @@ class Smt2Input : public AntlrInput {
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__SMT2_INPUT_H */
+#endif /* CVC4__PARSER__SMT2_INPUT_H */

diff --git a/src/parser/smt2/sygus_input.h b/src/parser/smt2/sygus_input.h
index 23227e96c27afca23adaacb55a23df8c32479884..a0e3e81ef7c0e231b48c8b954264e0196c07754a 100644 (file)
--- a/src/parser/smt2/sygus_input.h
+++ b/src/parser/smt2/sygus_input.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__SYGUS_INPUT_H
-#define __CVC4__PARSER__SYGUS_INPUT_H
+#ifndef CVC4__PARSER__SYGUS_INPUT_H
+#define CVC4__PARSER__SYGUS_INPUT_H
 
 #include "parser/antlr_input.h"
 #include "parser/smt2/Smt2Lexer.h"
@@ -83,4 +83,4 @@ class SygusInput : public AntlrInput {
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__SYGUS_INPUT_H */
+#endif /* CVC4__PARSER__SYGUS_INPUT_H */

diff --git a/src/parser/tptp/tptp.h b/src/parser/tptp/tptp.h
index db08311f00a68e160b32ef96c3adc234e7055e29..082b905df3c32b44a23633a84ae105da7d81f810 100644 (file)
--- a/src/parser/tptp/tptp.h
+++ b/src/parser/tptp/tptp.h
@@ -18,8 +18,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__TPTP_H
-#define __CVC4__PARSER__TPTP_H
+#ifndef CVC4__PARSER__TPTP_H
+#define CVC4__PARSER__TPTP_H
 
 #include <cassert>
 #include <unordered_map>
@@ -196,4 +196,4 @@ enum NonAssoc {
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__TPTP_INPUT_H */
+#endif /* CVC4__PARSER__TPTP_INPUT_H */

diff --git a/src/parser/tptp/tptp_input.h b/src/parser/tptp/tptp_input.h
index dab98b91bf9f766787fc623618cae951d463a46a..5205cbc176ace544cb8da6f8c5f3d7f9317322ac 100644 (file)
--- a/src/parser/tptp/tptp_input.h
+++ b/src/parser/tptp/tptp_input.h
@@ -16,8 +16,8 @@
 
 #include "cvc4parser_private.h"
 
-#ifndef __CVC4__PARSER__TPTP_INPUT_H
-#define __CVC4__PARSER__TPTP_INPUT_H
+#ifndef CVC4__PARSER__TPTP_INPUT_H
+#define CVC4__PARSER__TPTP_INPUT_H
 
 #include "parser/antlr_input.h"
 #include "parser/tptp/TptpLexer.h"
@@ -83,4 +83,4 @@ class TptpInput : public AntlrInput {
 }/* CVC4::parser namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PARSER__TPTP_INPUT_H */
+#endif /* CVC4__PARSER__TPTP_INPUT_H */

diff --git a/src/preprocessing/assertion_pipeline.h b/src/preprocessing/assertion_pipeline.h
index aea2554bd18b63845c807fe2fa4ed98688e1c95e..cc9d1c2af2db77aef284eda7c196165f5698e593 100644 (file)
--- a/src/preprocessing/assertion_pipeline.h
+++ b/src/preprocessing/assertion_pipeline.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__ASSERTION_PIPELINE_H
-#define __CVC4__PREPROCESSING__ASSERTION_PIPELINE_H
+#ifndef CVC4__PREPROCESSING__ASSERTION_PIPELINE_H
+#define CVC4__PREPROCESSING__ASSERTION_PIPELINE_H
 
 #include <vector>
 
@@ -117,4 +117,4 @@ class AssertionPipeline
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__ASSERTION_PIPELINE_H */
+#endif /* CVC4__PREPROCESSING__ASSERTION_PIPELINE_H */

diff --git a/src/preprocessing/passes/apply_substs.h b/src/preprocessing/passes/apply_substs.h
index ea85855061e997fb986f7e0d787f6e3a8de6612f..f20ffa61ebe3d74d2bc018659ac82c2e2f728dfb 100644 (file)
--- a/src/preprocessing/passes/apply_substs.h
+++ b/src/preprocessing/passes/apply_substs.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H
-#define __CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H
+#ifndef CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H
+#define CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"

diff --git a/src/preprocessing/passes/apply_to_const.h b/src/preprocessing/passes/apply_to_const.h
index 3ff8dec756bdc6d165160d50e138d20339344f51..4c1df22ca8a21ff42ee2f95f93cb6251f05d832f 100644 (file)
--- a/src/preprocessing/passes/apply_to_const.h
+++ b/src/preprocessing/passes/apply_to_const.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H
-#define __CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H
+#ifndef CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H
+#define CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H
 
 #include <unordered_map>
 
@@ -48,4 +48,4 @@ class ApplyToConst : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H */
+#endif /* CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H */

diff --git a/src/preprocessing/passes/bool_to_bv.h b/src/preprocessing/passes/bool_to_bv.h
index 57f69a6e351fe98e20127a2fac15b6b89c5e3b0b..11cb551fa736a361ee352af1b9a165cc9d6e2b77 100644 (file)
--- a/src/preprocessing/passes/bool_to_bv.h
+++ b/src/preprocessing/passes/bool_to_bv.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H
-#define __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H
+#ifndef CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H
+#define CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -70,4 +70,4 @@ class BoolToBV : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H */
+#endif /* CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H */

diff --git a/src/preprocessing/passes/bv_abstraction.h b/src/preprocessing/passes/bv_abstraction.h
index 963e99570df94df2b620fe505734f399094bb76a..b5840b3552bf6f811b9f7d505df7275c4743ebbf 100644 (file)
--- a/src/preprocessing/passes/bv_abstraction.h
+++ b/src/preprocessing/passes/bv_abstraction.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H
-#define __CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H
+#ifndef CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H
+#define CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -47,4 +47,4 @@ class BvAbstraction : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H */
+#endif /* CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H */

diff --git a/src/preprocessing/passes/bv_ackermann.h b/src/preprocessing/passes/bv_ackermann.h
index 645dd72aac931957a177a005388e18b8fc441ad0..98d1080bd6d9ea352412b9829b2ab478f01b6aaa 100644 (file)
--- a/src/preprocessing/passes/bv_ackermann.h
+++ b/src/preprocessing/passes/bv_ackermann.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__BV_ACKERMANN_H
-#define __CVC4__PREPROCESSING__PASSES__BV_ACKERMANN_H
+#ifndef CVC4__PREPROCESSING__PASSES__BV_ACKERMANN_H
+#define CVC4__PREPROCESSING__PASSES__BV_ACKERMANN_H
 
 #include <unordered_map>
 #include "expr/node.h"

diff --git a/src/preprocessing/passes/bv_eager_atoms.h b/src/preprocessing/passes/bv_eager_atoms.h
index c83a1649119b49629485d99e7a9fe506cef47da8..4ed68585574e3d74fe65a4527ef871aaa09d3c3d 100644 (file)
--- a/src/preprocessing/passes/bv_eager_atoms.h
+++ b/src/preprocessing/passes/bv_eager_atoms.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H
-#define __CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H
+#ifndef CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H
+#define CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -41,4 +41,4 @@ class BvEagerAtoms : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H */
+#endif /* CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H */

diff --git a/src/preprocessing/passes/bv_gauss.h b/src/preprocessing/passes/bv_gauss.h
index e991b17c44d88405aaa03413df9771f93770b818..862777a9bc52cef39dc398c8d31bae1722ebdc97 100644 (file)
--- a/src/preprocessing/passes/bv_gauss.h
+++ b/src/preprocessing/passes/bv_gauss.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H
-#define __CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H
+#ifndef CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H
+#define CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"

diff --git a/src/preprocessing/passes/bv_intro_pow2.h b/src/preprocessing/passes/bv_intro_pow2.h
index c0238b01ecf6e90390c58b6ff22da0839cb0c9b7..86d5ebfefc802a4633799cb7f738d4aa04bc0684 100644 (file)
--- a/src/preprocessing/passes/bv_intro_pow2.h
+++ b/src/preprocessing/passes/bv_intro_pow2.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H
-#define __CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H
+#ifndef CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H
+#define CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -42,4 +42,4 @@ class BvIntroPow2 : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H */
+#endif /* CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H */

diff --git a/src/preprocessing/passes/bv_to_bool.h b/src/preprocessing/passes/bv_to_bool.h
index 83502e3d8df482c0b3b56fe6ec4a2c126bf948af..dc0494943fb5714773a1f4839dec8030e0347ebd 100644 (file)
--- a/src/preprocessing/passes/bv_to_bool.h
+++ b/src/preprocessing/passes/bv_to_bool.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H
-#define __CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H
+#ifndef CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H
+#define CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -76,4 +76,4 @@ class BVToBool : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H */
+#endif /* CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H */

diff --git a/src/preprocessing/passes/extended_rewriter_pass.h b/src/preprocessing/passes/extended_rewriter_pass.h
index aa379329be6fd05c58fddf3d0b69ed1964c50792..dbaaa05ad42e4087dad62a7c754957e7a81179e2 100644 (file)
--- a/src/preprocessing/passes/extended_rewriter_pass.h
+++ b/src/preprocessing/passes/extended_rewriter_pass.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H
-#define __CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H
+#ifndef CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H
+#define CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -40,4 +40,4 @@ class ExtRewPre : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H */
+#endif /* CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H */

diff --git a/src/preprocessing/passes/global_negate.h b/src/preprocessing/passes/global_negate.h
index 84d78d9596136502649bd1b7a87c01319a67a2cc..89c3a3e3e42a32ebc69cfe8f4f11004a5fd96ccd 100644 (file)
--- a/src/preprocessing/passes/global_negate.h
+++ b/src/preprocessing/passes/global_negate.h
@@ -22,8 +22,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H
-#define __CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H
+#ifndef CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H
+#define CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -49,4 +49,4 @@ class GlobalNegate : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING_PASSES__GLOBAL_NEGATE_H */
+#endif /* CVC4__PREPROCESSING_PASSES__GLOBAL_NEGATE_H */

diff --git a/src/preprocessing/passes/int_to_bv.h b/src/preprocessing/passes/int_to_bv.h
index 225f9945f28108a3c1ea9b495a0dffbb3a25eec2..95f31621a933d8c83883c53efd2b9e40e44abbd2 100644 (file)
--- a/src/preprocessing/passes/int_to_bv.h
+++ b/src/preprocessing/passes/int_to_bv.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__INT_TO_BV_H
-#define __CVC4__PREPROCESSING__PASSES__INT_TO_BV_H
+#ifndef CVC4__PREPROCESSING__PASSES__INT_TO_BV_H
+#define CVC4__PREPROCESSING__PASSES__INT_TO_BV_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -42,4 +42,4 @@ class IntToBV : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__INT_TO_BV_H */
+#endif /* CVC4__PREPROCESSING__PASSES__INT_TO_BV_H */

diff --git a/src/preprocessing/passes/ite_removal.h b/src/preprocessing/passes/ite_removal.h
index cdc104dbe2c5c7ebf52b609328f733a33b0e4584..5620b4afb4f3074d25b3a4be7c520e858d02d03b 100644 (file)
--- a/src/preprocessing/passes/ite_removal.h
+++ b/src/preprocessing/passes/ite_removal.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H
-#define __CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H
+#ifndef CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H
+#define CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H
 
 #include <unordered_set>
 #include <vector>
@@ -43,4 +43,4 @@ class IteRemoval : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif  // __CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H
+#endif  // CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H

diff --git a/src/preprocessing/passes/ite_simp.h b/src/preprocessing/passes/ite_simp.h
index 8d7ad648aca28739f6cec67011923e2f28e89baa..44976bded1d24f386f5a077a180b91436b06fe0b 100644 (file)
--- a/src/preprocessing/passes/ite_simp.h
+++ b/src/preprocessing/passes/ite_simp.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__ITE_SIMP_H
-#define __CVC4__PREPROCESSING__PASSES__ITE_SIMP_H
+#ifndef CVC4__PREPROCESSING__PASSES__ITE_SIMP_H
+#define CVC4__PREPROCESSING__PASSES__ITE_SIMP_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"

diff --git a/src/preprocessing/passes/miplib_trick.h b/src/preprocessing/passes/miplib_trick.h
index 93fa701d19a5a6867c9eb9068481c45b2a3f9dcd..f1748d6352d42538937a5e42f8b917c6a5226c09 100644 (file)
--- a/src/preprocessing/passes/miplib_trick.h
+++ b/src/preprocessing/passes/miplib_trick.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H
-#define __CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H
+#ifndef CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H
+#define CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -59,4 +59,4 @@ class MipLibTrick : public PreprocessingPass, public NodeManagerListener
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H */
+#endif /* CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H */

diff --git a/src/preprocessing/passes/nl_ext_purify.h b/src/preprocessing/passes/nl_ext_purify.h
index dcaf12b5e28b6668eb75b73be394e5ebe0d01a53..7744df8244a6a0ff7a53d75296fa3aa35a4aae88 100644 (file)
--- a/src/preprocessing/passes/nl_ext_purify.h
+++ b/src/preprocessing/passes/nl_ext_purify.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H
-#define __CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H
+#ifndef CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H
+#define CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H
 
 #include <unordered_map>
 #include <vector>
@@ -54,4 +54,4 @@ class NlExtPurify : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H */
+#endif /* CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H */

diff --git a/src/preprocessing/passes/non_clausal_simp.h b/src/preprocessing/passes/non_clausal_simp.h
index 61706e382b2d218b5398fdfba6eb6a858228da68..cb4ece4a95693323fbd24420130a57c576bc4875 100644 (file)
--- a/src/preprocessing/passes/non_clausal_simp.h
+++ b/src/preprocessing/passes/non_clausal_simp.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H
-#define __CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H
+#ifndef CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H
+#define CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H
 
 #include <vector>
 

diff --git a/src/preprocessing/passes/pseudo_boolean_processor.h b/src/preprocessing/passes/pseudo_boolean_processor.h
index efbcb502ef0a2735012eaaf9678031e152b812d9..e73b721fffde85e6fe6c25a29baf0a04eaf84f93 100644 (file)
--- a/src/preprocessing/passes/pseudo_boolean_processor.h
+++ b/src/preprocessing/passes/pseudo_boolean_processor.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
-#define __CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
+#ifndef CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
+#define CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
 
 #include <unordered_set>
 #include <vector>
@@ -114,4 +114,4 @@ class PseudoBooleanProcessor : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif  // __CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
+#endif  // CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H

diff --git a/src/preprocessing/passes/quantifier_macros.h b/src/preprocessing/passes/quantifier_macros.h
index d92d8599c6216d16cc5e9e0f85c125b86e30a31f..6b62c4d317b2acc162da196a171def02e710a3bc 100644 (file)
--- a/src/preprocessing/passes/quantifier_macros.h
+++ b/src/preprocessing/passes/quantifier_macros.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H
-#define __CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H
+#ifndef CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H
+#define CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H
 
 #include <map>
 #include <string>
@@ -86,4 +86,4 @@ class QuantifierMacros : public PreprocessingPass
 }  // preprocessing
 }  // CVC4
 
-#endif /*__CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H */
+#endif /*CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H */

diff --git a/src/preprocessing/passes/quantifiers_preprocess.h b/src/preprocessing/passes/quantifiers_preprocess.h
index bb5d8f8e795972220420ce9605dca6ffa15867b3..991b3dd0543a68e6f37d35bce8b41ef7481fb49e 100644 (file)
--- a/src/preprocessing/passes/quantifiers_preprocess.h
+++ b/src/preprocessing/passes/quantifiers_preprocess.h
@@ -19,8 +19,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H
-#define __CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H
+#ifndef CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H
+#define CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -43,4 +43,4 @@ class QuantifiersPreprocess : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H */
+#endif /* CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H */

diff --git a/src/preprocessing/passes/real_to_int.h b/src/preprocessing/passes/real_to_int.h
index a3d95b5491713aa7d9ddf0704c153e906e9b58b0..7949fb051f62bbc59f4174dbed58fb98e5ccd74f 100644 (file)
--- a/src/preprocessing/passes/real_to_int.h
+++ b/src/preprocessing/passes/real_to_int.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H
-#define __CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H
+#ifndef CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H
+#define CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H
 
 #include <unordered_map>
 #include <vector>
@@ -49,4 +49,4 @@ class RealToInt : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H */
+#endif /* CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H */

diff --git a/src/preprocessing/passes/rewrite.h b/src/preprocessing/passes/rewrite.h
index a3d42d660580542dd0def4ac10a83d2562c50b8e..e83cafb85b688cf34866e1d589fd2fe0b99d3e5f 100644 (file)
--- a/src/preprocessing/passes/rewrite.h
+++ b/src/preprocessing/passes/rewrite.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__REWRITE_H
-#define __CVC4__PREPROCESSING__PASSES__REWRITE_H
+#ifndef CVC4__PREPROCESSING__PASSES__REWRITE_H
+#define CVC4__PREPROCESSING__PASSES__REWRITE_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -40,5 +40,5 @@ class Rewrite : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__REWRITE_H */
+#endif /* CVC4__PREPROCESSING__PASSES__REWRITE_H */
 

diff --git a/src/preprocessing/passes/sep_skolem_emp.h b/src/preprocessing/passes/sep_skolem_emp.h
index a8ea8db1cb4489cd82c55dade06dae1999b07213..1a5e36c4070ea903c775a3a1cfa587986d2e7da8 100644 (file)
--- a/src/preprocessing/passes/sep_skolem_emp.h
+++ b/src/preprocessing/passes/sep_skolem_emp.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H
-#define __CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H
+#ifndef CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H
+#define CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -39,4 +39,4 @@ class SepSkolemEmp : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H */
+#endif /* CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H */

diff --git a/src/preprocessing/passes/sort_infer.h b/src/preprocessing/passes/sort_infer.h
index e0ecd50c5f7db378d068f4930e832f0eda69a71d..ae722529dee1bbbd90a72926ef1fc5007022942f 100644 (file)
--- a/src/preprocessing/passes/sort_infer.h
+++ b/src/preprocessing/passes/sort_infer.h
@@ -12,8 +12,8 @@
  ** \brief Sort inference preprocessing pass
  **/
 
-#ifndef __CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_
-#define __CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_
+#ifndef CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_
+#define CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_
 
 #include <map>
 #include <string>
@@ -46,4 +46,4 @@ class SortInferencePass : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ */
+#endif /* CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ */

diff --git a/src/preprocessing/passes/static_learning.h b/src/preprocessing/passes/static_learning.h
index 27fb6f86b487a20aedef1876478b8052e715040c..f200755c57f1cfd7819e5049fbb8f5f74c12b791 100644 (file)
--- a/src/preprocessing/passes/static_learning.h
+++ b/src/preprocessing/passes/static_learning.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H
-#define __CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H
+#ifndef CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H
+#define CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -39,4 +39,4 @@ class StaticLearning : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H */
+#endif /* CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H */

diff --git a/src/preprocessing/passes/sygus_abduct.h b/src/preprocessing/passes/sygus_abduct.h
index 8e83bf1d7955bb53dda2e83946c45a703bf909b1..0e0868cda2af6eb21a2f7ddcb304eb631b305fb1 100644 (file)
--- a/src/preprocessing/passes/sygus_abduct.h
+++ b/src/preprocessing/passes/sygus_abduct.h
@@ -13,8 +13,8 @@
  ** input into an abduction problem.
  **/
 
-#ifndef __CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H
-#define __CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H
+#ifndef CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H
+#define CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -69,4 +69,4 @@ class SygusAbduct : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H_ */
+#endif /* CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H_ */

diff --git a/src/preprocessing/passes/sygus_inference.h b/src/preprocessing/passes/sygus_inference.h
index 9350a15c7ab562e4d8a7d2f866b718242581353a..91deb445c829c9324bf924c9c22ad41ae094a114 100644 (file)
--- a/src/preprocessing/passes/sygus_inference.h
+++ b/src/preprocessing/passes/sygus_inference.h
@@ -12,8 +12,8 @@
  ** \brief SygusInference
  **/
 
-#ifndef __CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_
-#define __CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_
+#ifndef CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_
+#define CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_
 
 #include <map>
 #include <string>
@@ -68,4 +68,4 @@ class SygusInference : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ */
+#endif /* CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ */

diff --git a/src/preprocessing/passes/symmetry_breaker.h b/src/preprocessing/passes/symmetry_breaker.h
index 6f3cd5e0b2a7020a38716a3e5ddc78957318988e..6bb10ebb80c48b77fab5377b2fe0c4c94659f897 100644 (file)
--- a/src/preprocessing/passes/symmetry_breaker.h
+++ b/src/preprocessing/passes/symmetry_breaker.h
@@ -12,8 +12,8 @@
  ** \brief Symmetry breaker for theories
  **/
 
-#ifndef __CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_
-#define __CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_
+#ifndef CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_
+#define CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_
 
 #include <map>
 #include <string>
@@ -106,4 +106,4 @@ class SymBreakerPass : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_ */
+#endif /* CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_ */

diff --git a/src/preprocessing/passes/symmetry_detect.h b/src/preprocessing/passes/symmetry_detect.h
index 1bc354419df412fc1fb17ea84cf59ac88248c3c5..07a54572330ddf20bfecdd5e08fbd9a05e6a7e8f 100644 (file)
--- a/src/preprocessing/passes/symmetry_detect.h
+++ b/src/preprocessing/passes/symmetry_detect.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__SYMMETRY_DETECT_H
-#define __CVC4__PREPROCESSING__PASSES__SYMMETRY_DETECT_H
+#ifndef CVC4__PREPROCESSING__PASSES__SYMMETRY_DETECT_H
+#define CVC4__PREPROCESSING__PASSES__SYMMETRY_DETECT_H
 
 #include <map>
 #include <string>

diff --git a/src/preprocessing/passes/synth_rew_rules.h b/src/preprocessing/passes/synth_rew_rules.h
index 4319c0243bec3a2020d11e9e19910bf2f7d85dfc..38ef98b356cf2757d92231d606ca0a9e3bfdb876 100644 (file)
--- a/src/preprocessing/passes/synth_rew_rules.h
+++ b/src/preprocessing/passes/synth_rew_rules.h
@@ -13,8 +13,8 @@
  ** where t1 and t2 are subterms of the input.
  **/
 
-#ifndef __CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H
-#define __CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H
+#ifndef CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H
+#define CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -74,4 +74,4 @@ class SynthRewRulesPass : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H */
+#endif /* CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H */

diff --git a/src/preprocessing/passes/theory_preprocess.h b/src/preprocessing/passes/theory_preprocess.h
index d8f75e4ba3bba3404bf8343d88a2c559949d1323..cfa9ab0b513faf49f16dabfc1a8de1f0e1b12cd9 100644 (file)
--- a/src/preprocessing/passes/theory_preprocess.h
+++ b/src/preprocessing/passes/theory_preprocess.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H
-#define __CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H
+#ifndef CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H
+#define CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H
 
 #include "preprocessing/preprocessing_pass.h"
 #include "preprocessing/preprocessing_pass_context.h"
@@ -40,4 +40,4 @@ class TheoryPreprocess : public PreprocessingPass
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H */
+#endif /* CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H */

diff --git a/src/preprocessing/passes/unconstrained_simplifier.h b/src/preprocessing/passes/unconstrained_simplifier.h
index f56b864895d437b65ef25c0456b39a0854fbde71..ac4fd0a036f78b2980033b3ec7a1b5d6fe0b3ba5 100644 (file)
--- a/src/preprocessing/passes/unconstrained_simplifier.h
+++ b/src/preprocessing/passes/unconstrained_simplifier.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H
-#define __CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H
+#ifndef CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H
+#define CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H
 
 #include <unordered_map>
 #include <unordered_set>

diff --git a/src/preprocessing/preprocessing_pass.h b/src/preprocessing/preprocessing_pass.h
index 7ffd5dc67a9c9f32ad571d05d619dc03fe110942..4a2e71488621768c926126409a9bc68363c3f976 100644 (file)
--- a/src/preprocessing/preprocessing_pass.h
+++ b/src/preprocessing/preprocessing_pass.h
@@ -28,8 +28,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PREPROCESSING_PASS_H
-#define __CVC4__PREPROCESSING__PREPROCESSING_PASS_H
+#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_H
+#define CVC4__PREPROCESSING__PREPROCESSING_PASS_H
 
 #include <string>
 
@@ -82,4 +82,4 @@ class PreprocessingPass {
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PREPROCESSING_PASS_H */
+#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_H */

diff --git a/src/preprocessing/preprocessing_pass_context.h b/src/preprocessing/preprocessing_pass_context.h
index d6a3b9f0f59456a9c1301d43857d8e0ebabd0c23..e37680538fd9504577718e904358a88a96ae92b1 100644 (file)
--- a/src/preprocessing/preprocessing_pass_context.h
+++ b/src/preprocessing/preprocessing_pass_context.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H
-#define __CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H
+#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H
+#define CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H
 
 #include "context/cdo.h"
 #include "context/context.h"
@@ -121,4 +121,4 @@ class PreprocessingPassContext
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H */
+#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H */

diff --git a/src/preprocessing/preprocessing_pass_registry.h b/src/preprocessing/preprocessing_pass_registry.h
index 786e5913535c7d23ad198a6491537cbd61415b7f..9cc1098974719423fdd2ff078071da99bf18079b 100644 (file)
--- a/src/preprocessing/preprocessing_pass_registry.h
+++ b/src/preprocessing/preprocessing_pass_registry.h
@@ -16,8 +16,8 @@
  **/
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H
-#define __CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H
+#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H
+#define CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H
 
 #include <memory>
 #include <string>
@@ -97,4 +97,4 @@ class PreprocessingPassRegistry {
 }  // namespace preprocessing
 }  // namespace CVC4
 
-#endif /* __CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H */
+#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H */

diff --git a/src/preprocessing/util/ite_utilities.h b/src/preprocessing/util/ite_utilities.h
index 383a087c1114045dd059a8acbf6690336aaac437..ad195e62e1fda9c116a69629938dca810278544f 100644 (file)
--- a/src/preprocessing/util/ite_utilities.h
+++ b/src/preprocessing/util/ite_utilities.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__ITE_UTILITIES_H
-#define __CVC4__ITE_UTILITIES_H
+#ifndef CVC4__ITE_UTILITIES_H
+#define CVC4__ITE_UTILITIES_H
 
 #include <unordered_map>
 #include <vector>

diff --git a/src/printer/ast/ast_printer.h b/src/printer/ast/ast_printer.h
index d49e17da29a3e931551bd20fda8b24dcb2336247..fa109c7792a53af83ca22d81b266ac7c608aa531 100644 (file)
--- a/src/printer/ast/ast_printer.h
+++ b/src/printer/ast/ast_printer.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PRINTER__AST_PRINTER_H
-#define __CVC4__PRINTER__AST_PRINTER_H
+#ifndef CVC4__PRINTER__AST_PRINTER_H
+#define CVC4__PRINTER__AST_PRINTER_H
 
 #include <iostream>
 
@@ -54,4 +54,4 @@ class AstPrinter : public CVC4::Printer {
 }/* CVC4::printer namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PRINTER__AST_PRINTER_H */
+#endif /* CVC4__PRINTER__AST_PRINTER_H */

diff --git a/src/printer/cvc/cvc_printer.h b/src/printer/cvc/cvc_printer.h
index e85a66a05f3d1520af715b3c354a29c21658193d..d379af7e340dc40b2ece53da3647d742cd93d190 100644 (file)
--- a/src/printer/cvc/cvc_printer.h
+++ b/src/printer/cvc/cvc_printer.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PRINTER__CVC_PRINTER_H
-#define __CVC4__PRINTER__CVC_PRINTER_H
+#ifndef CVC4__PRINTER__CVC_PRINTER_H
+#define CVC4__PRINTER__CVC_PRINTER_H
 
 #include <iostream>
 
@@ -57,4 +57,4 @@ class CvcPrinter : public CVC4::Printer {
 }/* CVC4::printer namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PRINTER__CVC_PRINTER_H */
+#endif /* CVC4__PRINTER__CVC_PRINTER_H */

diff --git a/src/printer/dagification_visitor.h b/src/printer/dagification_visitor.h
index ed0f1ada7db52974bdca6e0fcf97e3c2b64d0006..18f31e662eb98370bd77cd69e67886f4ee653fe1 100644 (file)
--- a/src/printer/dagification_visitor.h
+++ b/src/printer/dagification_visitor.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PRINTER__DAGIFICATION_VISITOR_H
-#define __CVC4__PRINTER__DAGIFICATION_VISITOR_H
+#ifndef CVC4__PRINTER__DAGIFICATION_VISITOR_H
+#define CVC4__PRINTER__DAGIFICATION_VISITOR_H
 
 #include <string>
 #include <unordered_map>
@@ -175,4 +175,4 @@ public:
 }/* CVC4::printer namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PRINTER__DAGIFICATION_VISITOR_H */
+#endif /* CVC4__PRINTER__DAGIFICATION_VISITOR_H */

diff --git a/src/printer/printer.h b/src/printer/printer.h
index 051eb6c9787ecd2ba72543dbba2b121489e947dc..85b7d498f53b387d2bb54527d37f6a6157a96fb3 100644 (file)
--- a/src/printer/printer.h
+++ b/src/printer/printer.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PRINTER__PRINTER_H
-#define __CVC4__PRINTER__PRINTER_H
+#ifndef CVC4__PRINTER__PRINTER_H
+#define CVC4__PRINTER__PRINTER_H
 
 #include <map>
 #include <string>
@@ -113,4 +113,4 @@ class Printer
 
 }  // namespace CVC4
 
-#endif /* __CVC4__PRINTER__PRINTER_H */
+#endif /* CVC4__PRINTER__PRINTER_H */

diff --git a/src/printer/smt2/smt2_printer.h b/src/printer/smt2/smt2_printer.h
index 3f80f0612264adfb3afaa22d8c07504dd3ee3a83..57923136411e4726794a9ce0acdd95a10926c917 100644 (file)
--- a/src/printer/smt2/smt2_printer.h
+++ b/src/printer/smt2/smt2_printer.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PRINTER__SMT2_PRINTER_H
-#define __CVC4__PRINTER__SMT2_PRINTER_H
+#ifndef CVC4__PRINTER__SMT2_PRINTER_H
+#define CVC4__PRINTER__SMT2_PRINTER_H
 
 #include <iostream>
 
@@ -80,4 +80,4 @@ class Smt2Printer : public CVC4::Printer {
 }/* CVC4::printer namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PRINTER__SMT2_PRINTER_H */
+#endif /* CVC4__PRINTER__SMT2_PRINTER_H */

diff --git a/src/printer/sygus_print_callback.h b/src/printer/sygus_print_callback.h
index 5b099aa1f9f597fdd7c24d0665d58c5c53fb0a31..d956fd4c6709ba1aace406d40fb9417e5f889aef 100644 (file)
--- a/src/printer/sygus_print_callback.h
+++ b/src/printer/sygus_print_callback.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H
-#define __CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H
+#ifndef CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H
+#define CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H
 
 #include <vector>
 
@@ -172,4 +172,4 @@ class CVC4_PUBLIC SygusEmptyPrintCallback : public SygusPrintCallback
 } /* CVC4::printer namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H */
+#endif /* CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H */

diff --git a/src/printer/tptp/tptp_printer.h b/src/printer/tptp/tptp_printer.h
index ae7817a4773ae998a589ae4128328e2413c4ae90..63272891e6076c132f874b845115d44b1c0ddf7b 100644 (file)
--- a/src/printer/tptp/tptp_printer.h
+++ b/src/printer/tptp/tptp_printer.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PRINTER__TPTP_PRINTER_H
-#define __CVC4__PRINTER__TPTP_PRINTER_H
+#ifndef CVC4__PRINTER__TPTP_PRINTER_H
+#define CVC4__PRINTER__TPTP_PRINTER_H
 
 #include <iostream>
 
@@ -58,4 +58,4 @@ class TptpPrinter : public CVC4::Printer {
 }/* CVC4::printer namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PRINTER__TPTP_PRINTER_H */
+#endif /* CVC4__PRINTER__TPTP_PRINTER_H */

diff --git a/src/proof/arith_proof.h b/src/proof/arith_proof.h
index a93bf4c5737b8cb9631858c233a79bd474a4dfa7..a1df24fac7d9be9ff8a2610285e8748b36a1ea09 100644 (file)
--- a/src/proof/arith_proof.h
+++ b/src/proof/arith_proof.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__ARITH__PROOF_H
-#define __CVC4__ARITH__PROOF_H
+#ifndef CVC4__ARITH__PROOF_H
+#define CVC4__ARITH__PROOF_H
 
 #include <memory>
 #include <unordered_set>
@@ -172,4 +172,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__ARITH__PROOF_H */
+#endif /* CVC4__ARITH__PROOF_H */

diff --git a/src/proof/arith_proof_recorder.h b/src/proof/arith_proof_recorder.h
index fe7bffbd008f195cc2b403f2adf6b6d75ea7008e..3fff6968dbfb9d4b89bc46daec4e9dc3855fb16a 100644 (file)
--- a/src/proof/arith_proof_recorder.h
+++ b/src/proof/arith_proof_recorder.h
@@ -42,8 +42,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__ARITH_PROOF_RECORDER_H
-#define __CVC4__PROOF__ARITH_PROOF_RECORDER_H
+#ifndef CVC4__PROOF__ARITH_PROOF_RECORDER_H
+#define CVC4__PROOF__ARITH_PROOF_RECORDER_H
 
 #include <map>
 #include <set>

diff --git a/src/proof/array_proof.h b/src/proof/array_proof.h
index 7e3340af095cb202a4e2cee801efc1bae4990464..372ad1f67e4d0c1a4d37039f046496cef0f7c92d 100644 (file)
--- a/src/proof/array_proof.h
+++ b/src/proof/array_proof.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__ARRAY__PROOF_H
-#define __CVC4__ARRAY__PROOF_H
+#ifndef CVC4__ARRAY__PROOF_H
+#define CVC4__ARRAY__PROOF_H
 
 #include <memory>
 #include <unordered_set>
@@ -117,4 +117,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__ARRAY__PROOF_H */
+#endif /* CVC4__ARRAY__PROOF_H */

diff --git a/src/proof/bitvector_proof.h b/src/proof/bitvector_proof.h
index 91c07fcb5884bd0041bd8a612b0aa17c7717a4a6..f0a0717fa145c78e5e85e7f78a229f1fe02977bf 100644 (file)
--- a/src/proof/bitvector_proof.h
+++ b/src/proof/bitvector_proof.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BITVECTOR_PROOF_H
-#define __CVC4__BITVECTOR_PROOF_H
+#ifndef CVC4__BITVECTOR_PROOF_H
+#define CVC4__BITVECTOR_PROOF_H
 
 #include <set>
 #include <unordered_map>
@@ -276,4 +276,4 @@ class BitVectorProof : public TheoryProof
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BITVECTOR__PROOF_H */
+#endif /* CVC4__BITVECTOR__PROOF_H */

diff --git a/src/proof/clausal_bitvector_proof.h b/src/proof/clausal_bitvector_proof.h
index b53bcd5e2bebcece64f617435760ef5c7ea081bd..b10b1ad1ce67ddfc844e306cbe7eb80a6de9c379 100644 (file)
--- a/src/proof/clausal_bitvector_proof.h
+++ b/src/proof/clausal_bitvector_proof.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H
-#define __CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H
+#ifndef CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H
+#define CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H
 
 #include <iostream>
 #include <sstream>
@@ -135,4 +135,4 @@ class LfscErBitVectorProof : public LfscClausalBitVectorProof
 
 }  // namespace CVC4
 
-#endif /* __CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H */
+#endif /* CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H */

diff --git a/src/proof/clause_id.h b/src/proof/clause_id.h
index e8b9841c8f12ce68fe7132ca974e8367f74811cc..4a9ebc74a3b3bd9c9cc1823024d0a6566a241354 100644 (file)
--- a/src/proof/clause_id.h
+++ b/src/proof/clause_id.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__CLAUSE_ID_H
-#define __CVC4__PROOF__CLAUSE_ID_H
+#ifndef CVC4__PROOF__CLAUSE_ID_H
+#define CVC4__PROOF__CLAUSE_ID_H
 
 namespace CVC4 {
 
@@ -30,4 +30,4 @@ typedef unsigned ClauseId;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PROOF__CLAUSE_ID_H */
+#endif /* CVC4__PROOF__CLAUSE_ID_H */

diff --git a/src/proof/cnf_proof.h b/src/proof/cnf_proof.h
index a17777c66f3e09acba1ad2dd3a8831bcbf28a479..e589950bc361caf5ac60c4b0b6369f434105a687 100644 (file)
--- a/src/proof/cnf_proof.h
+++ b/src/proof/cnf_proof.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__CNF_PROOF_H
-#define __CVC4__CNF_PROOF_H
+#ifndef CVC4__CNF_PROOF_H
+#define CVC4__CNF_PROOF_H
 
 #include <iosfwd>
 #include <unordered_map>
@@ -212,4 +212,4 @@ public:
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__CNF_PROOF_H */
+#endif /* CVC4__CNF_PROOF_H */

diff --git a/src/proof/dimacs_printer.h b/src/proof/dimacs_printer.h
index f46cb51ecedb283c20202d9c1df630ad32a04239..2ae4abefa35240e71525ffd4bd816bb3aed6a0e7 100644 (file)
--- a/src/proof/dimacs_printer.h
+++ b/src/proof/dimacs_printer.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__DIMACS_PRINTER_H
-#define __CVC4__PROOF__DIMACS_PRINTER_H
+#ifndef CVC4__PROOF__DIMACS_PRINTER_H
+#define CVC4__PROOF__DIMACS_PRINTER_H
 
 #include <iosfwd>
 #include <memory>
@@ -63,4 +63,4 @@ void printDimacs(
 }  // namespace proof
 }  // namespace CVC4
 
-#endif  // __CVC4__PROOF__DIMACS_PRINTER_H
+#endif  // CVC4__PROOF__DIMACS_PRINTER_H

diff --git a/src/proof/drat/drat_proof.h b/src/proof/drat/drat_proof.h
index c4b7c2e02eb9c9d0fffe99f8fa0e136f0cfa3be4..082107d0abf91e14860354786a09b2b6cb65f5a5 100644 (file)
--- a/src/proof/drat/drat_proof.h
+++ b/src/proof/drat/drat_proof.h
@@ -19,8 +19,8 @@
  **
  **/
 
-#ifndef __CVC4__PROOF__DRAT__DRAT_PROOF_H
-#define __CVC4__PROOF__DRAT__DRAT_PROOF_H
+#ifndef CVC4__PROOF__DRAT__DRAT_PROOF_H
+#define CVC4__PROOF__DRAT__DRAT_PROOF_H
 
 #include "cvc4_private.h"
 #include "prop/sat_solver.h"
@@ -137,4 +137,4 @@ class DratProof
 }  // namespace proof
 }  // namespace CVC4
 
-#endif  // __CVC4__PROOF__DRAT__DRAT_PROOF_H
+#endif  // CVC4__PROOF__DRAT__DRAT_PROOF_H

diff --git a/src/proof/er/er_proof.h b/src/proof/er/er_proof.h
index 0a0038738af7b786bf604855b115a9d45acd5f96..f5af0783bb5db3fc79b476f6aa2cc266018c1095 100644 (file)
--- a/src/proof/er/er_proof.h
+++ b/src/proof/er/er_proof.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__ER__ER_PROOF_H
-#define __CVC4__PROOF__ER__ER_PROOF_H
+#ifndef CVC4__PROOF__ER__ER_PROOF_H
+#define CVC4__PROOF__ER__ER_PROOF_H
 
 #include <memory>
 #include <vector>
@@ -205,4 +205,4 @@ class ErProof
 }  // namespace proof
 }  // namespace CVC4
 
-#endif  // __CVC4__PROOF__ER__ER_PROOF_H
+#endif  // CVC4__PROOF__ER__ER_PROOF_H

diff --git a/src/proof/lemma_proof.h b/src/proof/lemma_proof.h
index b4b40ef1bad878c37e359c711ab315258660ba6e..7dfce57cf3fc3dda695411d8bb646686659bbd59 100644 (file)
--- a/src/proof/lemma_proof.h
+++ b/src/proof/lemma_proof.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__LEMMA_PROOF_H
-#define __CVC4__LEMMA_PROOF_H
+#ifndef CVC4__LEMMA_PROOF_H
+#define CVC4__LEMMA_PROOF_H
 
 #include "expr/expr.h"
 #include "proof/clause_id.h"
@@ -112,4 +112,4 @@ std::ostream& operator<<(std::ostream & out, const LemmaProofRecipe & recipe);
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__LEMMA_PROOF_H */
+#endif /* CVC4__LEMMA_PROOF_H */

diff --git a/src/proof/lfsc_proof_printer.h b/src/proof/lfsc_proof_printer.h
index beef4823e384efab6299dba972429f096cb9c545..f2f55aa94f0ae84f2cef8f51762ed6bd21123afe 100644 (file)
--- a/src/proof/lfsc_proof_printer.h
+++ b/src/proof/lfsc_proof_printer.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__LFSC_PROOF_PRINTER_H
-#define __CVC4__PROOF__LFSC_PROOF_PRINTER_H
+#ifndef CVC4__PROOF__LFSC_PROOF_PRINTER_H
+#define CVC4__PROOF__LFSC_PROOF_PRINTER_H
 
 #include <iosfwd>
 #include <string>
@@ -151,4 +151,4 @@ class LFSCProofPrinter
 }  // namespace proof
 }  // namespace CVC4
 
-#endif /* __CVC4__PROOF__LFSC_PROOF_PRINTER_H */
+#endif /* CVC4__PROOF__LFSC_PROOF_PRINTER_H */

diff --git a/src/proof/lrat/lrat_proof.h b/src/proof/lrat/lrat_proof.h
index f231e5a6b2394dac75693f9032a5fb15aa9a087c..33b2fad3ff97e3753ba67d85cf6ab455aeb29c4a 100644 (file)
--- a/src/proof/lrat/lrat_proof.h
+++ b/src/proof/lrat/lrat_proof.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__LRAT__LRAT_PROOF_H
-#define __CVC4__PROOF__LRAT__LRAT_PROOF_H
+#ifndef CVC4__PROOF__LRAT__LRAT_PROOF_H
+#define CVC4__PROOF__LRAT__LRAT_PROOF_H
 
 #include <iosfwd>
 #include <string>

diff --git a/src/proof/proof.h b/src/proof/proof.h
index b39d7313479e0220d27c496bac3410c0e0f06663..9e7e20a22e36eba699d6523dc88a738686db591f 100644 (file)
--- a/src/proof/proof.h
+++ b/src/proof/proof.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__PROOF_H
-#define __CVC4__PROOF__PROOF_H
+#ifndef CVC4__PROOF__PROOF_H
+#define CVC4__PROOF__PROOF_H
 
 #include "options/smt_options.h"
 
@@ -67,4 +67,4 @@
 # define PSTATS(x)
 #endif /* CVC4_PROOF_STATS */
 
-#endif /* __CVC4__PROOF__PROOF_H */
+#endif /* CVC4__PROOF__PROOF_H */

diff --git a/src/proof/proof_manager.h b/src/proof/proof_manager.h
index 0d3250b12c5ab48d853e054b1577073b3cde5f3b..eb5942beab217279a41ab340f583e4cccb8cfdec 100644 (file)
--- a/src/proof/proof_manager.h
+++ b/src/proof/proof_manager.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF_MANAGER_H
-#define __CVC4__PROOF_MANAGER_H
+#ifndef CVC4__PROOF_MANAGER_H
+#define CVC4__PROOF_MANAGER_H
 
 #include <iosfwd>
 #include <memory>
@@ -351,4 +351,4 @@ std::ostream& operator<<(std::ostream& out, CVC4::ProofRule k);
 
 
 
-#endif /* __CVC4__PROOF_MANAGER_H */
+#endif /* CVC4__PROOF_MANAGER_H */

diff --git a/src/proof/proof_output_channel.h b/src/proof/proof_output_channel.h
index 9bf1e0e5cde2735dfa992dfff8614d831d863797..ff84a37434b1aa3a073d20a30de70efa7dd045ff 100644 (file)
--- a/src/proof/proof_output_channel.h
+++ b/src/proof/proof_output_channel.h
@@ -13,8 +13,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF_OUTPUT_CHANNEL_H
-#define __CVC4__PROOF_OUTPUT_CHANNEL_H
+#ifndef CVC4__PROOF_OUTPUT_CHANNEL_H
+#define CVC4__PROOF_OUTPUT_CHANNEL_H
 
 #include <memory>
 #include <set>
@@ -74,4 +74,4 @@ public:
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__PROOF_OUTPUT_CHANNEL_H */
+#endif /* CVC4__PROOF_OUTPUT_CHANNEL_H */

diff --git a/src/proof/resolution_bitvector_proof.h b/src/proof/resolution_bitvector_proof.h
index 24d1bc76fc692ad34a4502c28573520ad6c159f6..5fd11092fc1e87b77001e778abada52d20e415f7 100644 (file)
--- a/src/proof/resolution_bitvector_proof.h
+++ b/src/proof/resolution_bitvector_proof.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROOF__RESOLUTION_BITVECTOR_PROOF_H
-#define __CVC4__PROOF__RESOLUTION_BITVECTOR_PROOF_H
+#ifndef CVC4__PROOF__RESOLUTION_BITVECTOR_PROOF_H
+#define CVC4__PROOF__RESOLUTION_BITVECTOR_PROOF_H
 
 #include <iosfwd>
 
@@ -110,4 +110,4 @@ class LfscResolutionBitVectorProof : public ResolutionBitVectorProof
 
 }  // namespace CVC4
 
-#endif /* __CVC4__PROOF__RESOLUTIONBITVECTORPROOF_H */
+#endif /* CVC4__PROOF__RESOLUTIONBITVECTORPROOF_H */

diff --git a/src/proof/sat_proof.h b/src/proof/sat_proof.h
index 82bd93947496daabc2352edbeb56683414740877..ec0928c07ca05ff57cc6ea14b35df2efba3f395e 100644 (file)
--- a/src/proof/sat_proof.h
+++ b/src/proof/sat_proof.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SAT__PROOF_H
-#define __CVC4__SAT__PROOF_H
+#ifndef CVC4__SAT__PROOF_H
+#define CVC4__SAT__PROOF_H
 
 #include <stdint.h>
 
@@ -373,4 +373,4 @@ void toSatClause(const typename Solver::TClause& minisat_cl,
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__SAT__PROOF_H */
+#endif /* CVC4__SAT__PROOF_H */

diff --git a/src/proof/sat_proof_implementation.h b/src/proof/sat_proof_implementation.h
index bc32b7959c721ec5fcee3cb64d734abe7feab73e..d9c959ae482b36f049f35ebf346cbaccadee21e7 100644 (file)
--- a/src/proof/sat_proof_implementation.h
+++ b/src/proof/sat_proof_implementation.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SAT__PROOF_IMPLEMENTATION_H
-#define __CVC4__SAT__PROOF_IMPLEMENTATION_H
+#ifndef CVC4__SAT__PROOF_IMPLEMENTATION_H
+#define CVC4__SAT__PROOF_IMPLEMENTATION_H
 
 #include "proof/clause_id.h"
 #include "proof/cnf_proof.h"
@@ -1081,4 +1081,4 @@ inline std::ostream& operator<<(std::ostream& out, CVC4::ClauseKind k) {
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__SAT__PROOF_IMPLEMENTATION_H */
+#endif /* CVC4__SAT__PROOF_IMPLEMENTATION_H */

diff --git a/src/proof/simplify_boolean_node.h b/src/proof/simplify_boolean_node.h
index 0b1cf4990fcab4f539ce4c7409a2a1c3382df218..fe8b7174b60d80ba3eaa079d3ef5a7e68f6fb7e5 100644 (file)
--- a/src/proof/simplify_boolean_node.h
+++ b/src/proof/simplify_boolean_node.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SIMPLIFY_BOOLEAN_NODE_H
-#define __CVC4__SIMPLIFY_BOOLEAN_NODE_H
+#ifndef CVC4__SIMPLIFY_BOOLEAN_NODE_H
+#define CVC4__SIMPLIFY_BOOLEAN_NODE_H
 
 namespace CVC4 {
 
@@ -24,4 +24,4 @@ Node simplifyBooleanNode(const Node &n);
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SIMPLIFY_BOOLEAN_NODE_H */
+#endif /* CVC4__SIMPLIFY_BOOLEAN_NODE_H */

diff --git a/src/proof/skolemization_manager.h b/src/proof/skolemization_manager.h
index 54b30e6f030b73b61d054650714940bb18735d6a..cb23268f3b2ddd9c3215ee539dc22511361a9a0e 100644 (file)
--- a/src/proof/skolemization_manager.h
+++ b/src/proof/skolemization_manager.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SKOLEMIZATION_MANAGER_H
-#define __CVC4__SKOLEMIZATION_MANAGER_H
+#ifndef CVC4__SKOLEMIZATION_MANAGER_H
+#define CVC4__SKOLEMIZATION_MANAGER_H
 
 #include <iostream>
 #include <unordered_map>
@@ -52,4 +52,4 @@ private:
 
 
 
-#endif /* __CVC4__SKOLEMIZATION_MANAGER_H */
+#endif /* CVC4__SKOLEMIZATION_MANAGER_H */

diff --git a/src/proof/theory_proof.h b/src/proof/theory_proof.h
index 94765d95a5250b8714ac0c207f2ff4ac7c861f1e..b487b62a8b4ef71020e2afa2421f462c77c3f36c 100644 (file)
--- a/src/proof/theory_proof.h
+++ b/src/proof/theory_proof.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY_PROOF_H
-#define __CVC4__THEORY_PROOF_H
+#ifndef CVC4__THEORY_PROOF_H
+#define CVC4__THEORY_PROOF_H
 
 #include <iosfwd>
 #include <unordered_map>
@@ -401,4 +401,4 @@ public:
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY_PROOF_H */
+#endif /* CVC4__THEORY_PROOF_H */

diff --git a/src/proof/uf_proof.h b/src/proof/uf_proof.h
index e5fd396c5affbbc9532c49544782d144df3e3b9c..ca8b3f90e5833d2051d7cd959d154a0d0d584c54 100644 (file)
--- a/src/proof/uf_proof.h
+++ b/src/proof/uf_proof.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UF__PROOF_H
-#define __CVC4__UF__PROOF_H
+#ifndef CVC4__UF__PROOF_H
+#define CVC4__UF__PROOF_H
 
 #include <memory>
 #include <unordered_set>
@@ -102,4 +102,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UF__PROOF_H */
+#endif /* CVC4__UF__PROOF_H */

diff --git a/src/proof/unsat_core.h b/src/proof/unsat_core.h
index 6e0c8484091edb85e773a5e4b2741988374ec4ad..0217b63265e2412bb430dc4e2fe8d79a126d60e0 100644 (file)
--- a/src/proof/unsat_core.h
+++ b/src/proof/unsat_core.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__UNSAT_CORE_H
-#define __CVC4__UNSAT_CORE_H
+#ifndef CVC4__UNSAT_CORE_H
+#define CVC4__UNSAT_CORE_H
 
 #include <iosfwd>
 #include <vector>
@@ -71,4 +71,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UNSAT_CORE_H */
+#endif /* CVC4__UNSAT_CORE_H */

diff --git a/src/prop/bv_sat_solver_notify.h b/src/prop/bv_sat_solver_notify.h
index d5a361eb8d19f2a656fe71aec757a183c6c644d1..77163cfe607d3166dd0eea55c37a6de61ed02007 100644 (file)
--- a/src/prop/bv_sat_solver_notify.h
+++ b/src/prop/bv_sat_solver_notify.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP__BVSATSOLVERNOTIFY_H
-#define __CVC4__PROP__BVSATSOLVERNOTIFY_H
+#ifndef CVC4__PROP__BVSATSOLVERNOTIFY_H
+#define CVC4__PROP__BVSATSOLVERNOTIFY_H
 
 #include "prop/sat_solver_types.h"
 

diff --git a/src/prop/cadical.h b/src/prop/cadical.h
index 747c9ddb23b6bc77307b6c82d751099c3d151f76..e43a2d278a4c6c3c098887f7faaf196d7b0896fc 100644 (file)
--- a/src/prop/cadical.h
+++ b/src/prop/cadical.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP__CADICAL_H
-#define __CVC4__PROP__CADICAL_H
+#ifndef CVC4__PROP__CADICAL_H
+#define CVC4__PROP__CADICAL_H
 
 #ifdef CVC4_USE_CADICAL
 
@@ -87,4 +87,4 @@ class CadicalSolver : public SatSolver
 }  // namespace CVC4
 
 #endif  // CVC4_USE_CADICAL
-#endif  // __CVC4__PROP__CADICAL_H
+#endif  // CVC4__PROP__CADICAL_H

diff --git a/src/prop/cnf_stream.h b/src/prop/cnf_stream.h
index c35b3d2fa98288f0007ab59510074dafd0643dc8..8e60863fabc8d4569a8e9a49ead534c32d818d4e 100644 (file)
--- a/src/prop/cnf_stream.h
+++ b/src/prop/cnf_stream.h
@@ -22,8 +22,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP__CNF_STREAM_H
-#define __CVC4__PROP__CNF_STREAM_H
+#ifndef CVC4__PROP__CNF_STREAM_H
+#define CVC4__PROP__CNF_STREAM_H
 
 #include "context/cdinsert_hashmap.h"
 #include "context/cdlist.h"
@@ -338,4 +338,4 @@ class TseitinCnfStream : public CnfStream {
 } /* CVC4::prop namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__PROP__CNF_STREAM_H */
+#endif /* CVC4__PROP__CNF_STREAM_H */

diff --git a/src/prop/cryptominisat.h b/src/prop/cryptominisat.h
index 4aa53909ab5a1db1b8e8173646d7826035a49b0c..d3c5aeb30c5d08baefdfc65e38057ebb270b4ea9 100644 (file)
--- a/src/prop/cryptominisat.h
+++ b/src/prop/cryptominisat.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP__CRYPTOMINISAT_H
-#define __CVC4__PROP__CRYPTOMINISAT_H
+#ifndef CVC4__PROP__CRYPTOMINISAT_H
+#define CVC4__PROP__CRYPTOMINISAT_H
 
 #ifdef CVC4_USE_CRYPTOMINISAT
 
@@ -95,4 +95,4 @@ public:
 }  // namespace CVC4
 
 #endif  // CVC4_USE_CRYPTOMINISAT
-#endif  // __CVC4__PROP__CRYPTOMINISAT_H
+#endif  // CVC4__PROP__CRYPTOMINISAT_H

diff --git a/src/prop/prop_engine.h b/src/prop/prop_engine.h
index 4815a3c35a07299bf1e34693340bf9bdbb3180de..aaa65b85afa934220b1f840b71379a1b5969e105 100644 (file)
--- a/src/prop/prop_engine.h
+++ b/src/prop/prop_engine.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP_ENGINE_H
-#define __CVC4__PROP_ENGINE_H
+#ifndef CVC4__PROP_ENGINE_H
+#define CVC4__PROP_ENGINE_H
 
 #include <sys/time.h>
 
@@ -248,4 +248,4 @@ public:
 }/* CVC4::prop namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PROP_ENGINE_H */
+#endif /* CVC4__PROP_ENGINE_H */

diff --git a/src/prop/registrar.h b/src/prop/registrar.h
index 01d69e14c3cd3147d1e51fcf9bd1e8a3aaa4de01..0846b8829d7120b66abeff0c987aef84b8a59bb7 100644 (file)
--- a/src/prop/registrar.h
+++ b/src/prop/registrar.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP__REGISTRAR_H
-#define __CVC4__PROP__REGISTRAR_H
+#ifndef CVC4__PROP__REGISTRAR_H
+#define CVC4__PROP__REGISTRAR_H
 
 namespace CVC4 {
 namespace prop {
@@ -42,4 +42,4 @@ public:
 }/* CVC4::prop namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PROP__REGISTRAR_H */
+#endif /* CVC4__PROP__REGISTRAR_H */

diff --git a/src/prop/sat_solver.h b/src/prop/sat_solver.h
index c3716aeea9acf278919e13dd7ebb5999b1f9d208..45bfca4d686ffe3e2dec8a27edc1b4757ea5ba72 100644 (file)
--- a/src/prop/sat_solver.h
+++ b/src/prop/sat_solver.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP__SAT_SOLVER_H
-#define __CVC4__PROP__SAT_SOLVER_H
+#ifndef CVC4__PROP__SAT_SOLVER_H
+#define CVC4__PROP__SAT_SOLVER_H
 
 #include <stdint.h>
 
@@ -192,4 +192,4 @@ inline std::ostream& operator <<(std::ostream& out, prop::SatValue val) {
 }/* CVC4::prop namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PROP__SAT_MODULE_H */
+#endif /* CVC4__PROP__SAT_MODULE_H */

diff --git a/src/prop/sat_solver_factory.h b/src/prop/sat_solver_factory.h
index 68c23de0b7f646f7663913efca63d3eb794f4253..5f8649768b9a53f0fda1285820e96ea4eab5159f 100644 (file)
--- a/src/prop/sat_solver_factory.h
+++ b/src/prop/sat_solver_factory.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP__SAT_SOLVER_FACTORY_H
-#define __CVC4__PROP__SAT_SOLVER_FACTORY_H
+#ifndef CVC4__PROP__SAT_SOLVER_FACTORY_H
+#define CVC4__PROP__SAT_SOLVER_FACTORY_H
 
 #include <string>
 #include <vector>
@@ -50,4 +50,4 @@ class SatSolverFactory
 }  // namespace prop
 }  // namespace CVC4
 
-#endif  // __CVC4__PROP__SAT_SOLVER_FACTORY_H
+#endif  // CVC4__PROP__SAT_SOLVER_FACTORY_H

diff --git a/src/prop/theory_proxy.h b/src/prop/theory_proxy.h
index 9b1069fc726ff602d493fd476a63018c230951a8..3bb15aa4e87dea07448482fe4476a886e210bed1 100644 (file)
--- a/src/prop/theory_proxy.h
+++ b/src/prop/theory_proxy.h
@@ -16,12 +16,12 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__PROP__SAT_H
-#define __CVC4__PROP__SAT_H
+#ifndef CVC4__PROP__SAT_H
+#define CVC4__PROP__SAT_H
 
 // Just defining this for now, since there's no other SAT solver bindings.
 // Optional blocks below will be unconditionally included
-#define __CVC4_USE_MINISAT
+#define CVC4_USE_MINISAT
 
 #include <iosfwd>
 #include <unordered_set>
@@ -152,4 +152,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PROP__SAT_H */
+#endif /* CVC4__PROP__SAT_H */

diff --git a/src/smt/command.h b/src/smt/command.h
index f3b17b3187fa68ce419a22e83f2af35c94f9277f..68f9d18815bcedc114d97653ed040cf394704b19 100644 (file)
--- a/src/smt/command.h
+++ b/src/smt/command.h
@@ -19,8 +19,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__COMMAND_H
-#define __CVC4__COMMAND_H
+#ifndef CVC4__COMMAND_H
+#define CVC4__COMMAND_H
 
 #include <iosfwd>
 #include <map>
@@ -1396,4 +1396,4 @@ class CVC4_PUBLIC DeclarationSequence : public CommandSequence
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__COMMAND_H */
+#endif /* CVC4__COMMAND_H */

diff --git a/src/smt/command_list.h b/src/smt/command_list.h
index 61226da416da4756f2dd7f26c25d813f99a44acb..0b1aaecf29f0c37c5b8f71421fb2024e16808eef 100644 (file)
--- a/src/smt/command_list.h
+++ b/src/smt/command_list.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SMT__COMMAND_LIST_H
-#define __CVC4__SMT__COMMAND_LIST_H
+#ifndef CVC4__SMT__COMMAND_LIST_H
+#define CVC4__SMT__COMMAND_LIST_H
 
 #include "context/cdlist.h"
 
@@ -36,4 +36,4 @@ typedef context::CDList<Command*, CommandCleanup> CommandList;
 }/* CVC4::smt namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT__COMMAND_LIST_H */
+#endif /* CVC4__SMT__COMMAND_LIST_H */

diff --git a/src/smt/dump.h b/src/smt/dump.h
index a68f712caf1e83aae469f60c88991df2f32e44d8..4946341af8ea364c78ec373ee4fd4721c911b30a 100644 (file)
--- a/src/smt/dump.h
+++ b/src/smt/dump.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__DUMP_H
-#define __CVC4__DUMP_H
+#ifndef CVC4__DUMP_H
+#define CVC4__DUMP_H
 
 #include "base/output.h"
 #include "smt/command.h"
@@ -110,4 +110,4 @@ extern DumpC DumpChannel CVC4_PUBLIC;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__DUMP_H */
+#endif /* CVC4__DUMP_H */

diff --git a/src/smt/logic_exception.h b/src/smt/logic_exception.h
index 5b197a1242b5c56b07d8541ffee26c34b2f220f5..e5da2a6e89c477f3d981202118848ff34ec08ebd 100644 (file)
--- a/src/smt/logic_exception.h
+++ b/src/smt/logic_exception.h
@@ -19,8 +19,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SMT__LOGIC_EXCEPTION_H
-#define __CVC4__SMT__LOGIC_EXCEPTION_H
+#ifndef CVC4__SMT__LOGIC_EXCEPTION_H
+#define CVC4__SMT__LOGIC_EXCEPTION_H
 
 #include "base/exception.h"
 
@@ -44,4 +44,4 @@ class CVC4_PUBLIC LogicException : public CVC4::Exception {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT__LOGIC_EXCEPTION_H */
+#endif /* CVC4__SMT__LOGIC_EXCEPTION_H */

diff --git a/src/smt/logic_request.h b/src/smt/logic_request.h
index 4d2957f875d1dccbe49262a7e47dbaad5f52e10b..432d5469cd9260fb3e247894e51cf3c8097c02d7 100644 (file)
--- a/src/smt/logic_request.h
+++ b/src/smt/logic_request.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__LOGIC_REQUEST_H
-#define __CVC4__LOGIC_REQUEST_H
+#ifndef CVC4__LOGIC_REQUEST_H
+#define CVC4__LOGIC_REQUEST_H
 
 #include "expr/kind.h"
 
@@ -49,4 +49,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__LOGIC_REQUEST_H */
+#endif /* CVC4__LOGIC_REQUEST_H */

diff --git a/src/smt/managed_ostreams.h b/src/smt/managed_ostreams.h
index a78bf57ee92657812932a0060d33967274e312b9..f495f8e7242a714363f1440553cbcf80767b2986 100644 (file)
--- a/src/smt/managed_ostreams.h
+++ b/src/smt/managed_ostreams.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__MANAGED_OSTREAMS_H
-#define __CVC4__MANAGED_OSTREAMS_H
+#ifndef CVC4__MANAGED_OSTREAMS_H
+#define CVC4__MANAGED_OSTREAMS_H
 
 #include <ostream>
 
@@ -179,4 +179,4 @@ class ManagedReplayLogOstream : public ManagedOstream {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__MANAGED_OSTREAMS_H */
+#endif /* CVC4__MANAGED_OSTREAMS_H */

diff --git a/src/smt/model.h b/src/smt/model.h
index 214581778af590e565df676c4c5ddb313eb2a3ce..b435fb5e2f37ec11b141b8ee78890d8d86a68010 100644 (file)
--- a/src/smt/model.h
+++ b/src/smt/model.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__MODEL_H
-#define __CVC4__MODEL_H
+#ifndef CVC4__MODEL_H
+#define CVC4__MODEL_H
 
 #include <iosfwd>
 #include <vector>
@@ -107,4 +107,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif  /* __CVC4__MODEL_H */
+#endif  /* CVC4__MODEL_H */

diff --git a/src/smt/model_core_builder.h b/src/smt/model_core_builder.h
index 1fbe9011ac5231bd03ae6c0ea7dbdebc6e033006..0c179e2873ad45381d6c00ea82cc66c7c46a6e20 100644 (file)
--- a/src/smt/model_core_builder.h
+++ b/src/smt/model_core_builder.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__MODEL_CORE_BUILDER_H
-#define __CVC4__THEORY__MODEL_CORE_BUILDER_H
+#ifndef CVC4__THEORY__MODEL_CORE_BUILDER_H
+#define CVC4__THEORY__MODEL_CORE_BUILDER_H
 
 #include <vector>
 
@@ -61,4 +61,4 @@ class ModelCoreBuilder
 
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__MODEL_CORE_BUILDER_H */
+#endif /* CVC4__THEORY__MODEL_CORE_BUILDER_H */

diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 39264fb01bae56ba48c9d41356288720bd990508..165e93997a5abaab1df6621822002e11d97ad3d9 100644 (file)
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SMT_ENGINE_H
-#define __CVC4__SMT_ENGINE_H
+#ifndef CVC4__SMT_ENGINE_H
+#define CVC4__SMT_ENGINE_H
 
 #include <string>
 #include <vector>
@@ -1064,4 +1064,4 @@ class CVC4_PUBLIC SmtEngine {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT_ENGINE_H */
+#endif /* CVC4__SMT_ENGINE_H */

diff --git a/src/smt/smt_engine_scope.h b/src/smt/smt_engine_scope.h
index b6db0c20c947770838d73a88af4efac440f110fc..d72d58caabf77f0d66bbda56eb53fa0f2b957f14 100644 (file)
--- a/src/smt/smt_engine_scope.h
+++ b/src/smt/smt_engine_scope.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SMT__SMT_ENGINE_SCOPE_H
-#define __CVC4__SMT__SMT_ENGINE_SCOPE_H
+#ifndef CVC4__SMT__SMT_ENGINE_SCOPE_H
+#define CVC4__SMT__SMT_ENGINE_SCOPE_H
 
 #include "expr/node_manager.h"
 
@@ -56,4 +56,4 @@ public:
 }/* CVC4::smt namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT__SMT_ENGINE_SCOPE_H */
+#endif /* CVC4__SMT__SMT_ENGINE_SCOPE_H */

diff --git a/src/smt/update_ostream.h b/src/smt/update_ostream.h
index 30fb98c026de4160e46151207043ccf4b51dde86..0427f405874af42c6f0dcfb73cec054dad7b2e83 100644 (file)
--- a/src/smt/update_ostream.h
+++ b/src/smt/update_ostream.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UPDATE_OSTREAM_H
-#define __CVC4__UPDATE_OSTREAM_H
+#ifndef CVC4__UPDATE_OSTREAM_H
+#define CVC4__UPDATE_OSTREAM_H
 
 #include <ostream>
 
@@ -121,4 +121,4 @@ class TraceOstreamUpdate : public OstreamUpdate {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UPDATE_OSTREAM_H */
+#endif /* CVC4__UPDATE_OSTREAM_H */

diff --git a/src/smt_util/boolean_simplification.h b/src/smt_util/boolean_simplification.h
index 71e0b55f3c34ded6d0b60d6c3bd754b627608f70..c1e2e4d76fba4a87a8112b0b72f48a24a3373e9f 100644 (file)
--- a/src/smt_util/boolean_simplification.h
+++ b/src/smt_util/boolean_simplification.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BOOLEAN_SIMPLIFICATION_H
-#define __CVC4__BOOLEAN_SIMPLIFICATION_H
+#ifndef CVC4__BOOLEAN_SIMPLIFICATION_H
+#define CVC4__BOOLEAN_SIMPLIFICATION_H
 
 #include <vector>
 #include <algorithm>
@@ -238,4 +238,4 @@ class BooleanSimplification {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BOOLEAN_SIMPLIFICATION_H */
+#endif /* CVC4__BOOLEAN_SIMPLIFICATION_H */

diff --git a/src/smt_util/lemma_channels.h b/src/smt_util/lemma_channels.h
index beafac58f3835d6b0349be4339309b5de2d8a803..40c58dd24f8df378c9f54d332367cbf331165fc5 100644 (file)
--- a/src/smt_util/lemma_channels.h
+++ b/src/smt_util/lemma_channels.h
@@ -25,8 +25,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SMT_UTIL__LEMMA_CHANNELS_H
-#define __CVC4__SMT_UTIL__LEMMA_CHANNELS_H
+#ifndef CVC4__SMT_UTIL__LEMMA_CHANNELS_H
+#define CVC4__SMT_UTIL__LEMMA_CHANNELS_H
 
 #include <iosfwd>
 #include <string>
@@ -74,4 +74,4 @@ class CVC4_PUBLIC LemmaChannels {
 
 } /* namespace CVC4 */
 
-#endif /* __CVC4__SMT_UTIL__LEMMA_CHANNELS_H */
+#endif /* CVC4__SMT_UTIL__LEMMA_CHANNELS_H */

diff --git a/src/smt_util/lemma_input_channel.h b/src/smt_util/lemma_input_channel.h
index 2140e9297ebed51c1cc6934557c91b74f87228f7..16bb457c8d9c08fa70409c7e1d6a8325c3ea1b83 100644 (file)
--- a/src/smt_util/lemma_input_channel.h
+++ b/src/smt_util/lemma_input_channel.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__LEMMA_INPUT_CHANNEL_H
-#define __CVC4__LEMMA_INPUT_CHANNEL_H
+#ifndef CVC4__LEMMA_INPUT_CHANNEL_H
+#define CVC4__LEMMA_INPUT_CHANNEL_H
 
 #include "expr/expr.h"
 
@@ -35,4 +35,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__LEMMA_INPUT_CHANNEL_H */
+#endif /* CVC4__LEMMA_INPUT_CHANNEL_H */

diff --git a/src/smt_util/lemma_output_channel.h b/src/smt_util/lemma_output_channel.h
index e53f1b8bc284c8372aa99becba12f82f7c0621a8..e2218775d305a3b2a5d36624571c4bb885c3ba5e 100644 (file)
--- a/src/smt_util/lemma_output_channel.h
+++ b/src/smt_util/lemma_output_channel.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__LEMMA_OUTPUT_CHANNEL_H
-#define __CVC4__LEMMA_OUTPUT_CHANNEL_H
+#ifndef CVC4__LEMMA_OUTPUT_CHANNEL_H
+#define CVC4__LEMMA_OUTPUT_CHANNEL_H
 
 #include "expr/expr.h"
 
@@ -43,4 +43,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__LEMMA_OUTPUT_CHANNEL_H */
+#endif /* CVC4__LEMMA_OUTPUT_CHANNEL_H */

diff --git a/src/theory/arith/arith_ite_utils.h b/src/theory/arith/arith_ite_utils.h
index 2d06e4be9229e7ba34b70e7d84be975b3d1d78e1..a9e7aa92c97b5adce7a0aa91ec8de76e30843a05 100644 (file)
--- a/src/theory/arith/arith_ite_utils.h
+++ b/src/theory/arith/arith_ite_utils.h
@@ -19,8 +19,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H
-#define __CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H
+#ifndef CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H
+#define CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H
 
 #include <unordered_map>
 
@@ -115,4 +115,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H */
+#endif /* CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H */

diff --git a/src/theory/arith/arith_msum.h b/src/theory/arith/arith_msum.h
index 44cce854c9aeac4f215f271dfa57c9ffdffb07b5..8a9dbf791e878ad847f95f8a5a336cc6c4b06c73 100644 (file)
--- a/src/theory/arith/arith_msum.h
+++ b/src/theory/arith/arith_msum.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__MSUM_H
-#define __CVC4__THEORY__ARITH__MSUM_H
+#ifndef CVC4__THEORY__ARITH__MSUM_H
+#define CVC4__THEORY__ARITH__MSUM_H
 
 #include <map>
 
@@ -185,4 +185,4 @@ class ArithMSum
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__MSUM_H */
+#endif /* CVC4__THEORY__ARITH__MSUM_H */

diff --git a/src/theory/arith/arith_rewriter.h b/src/theory/arith/arith_rewriter.h
index 88b9312291c56e596e52424875a40dc3e61e8ce2..de6b3f22826b60cbd8b2dcbcbc75d16a048a5181 100644 (file)
--- a/src/theory/arith/arith_rewriter.h
+++ b/src/theory/arith/arith_rewriter.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__ARITH_REWRITER_H
-#define __CVC4__THEORY__ARITH__ARITH_REWRITER_H
+#ifndef CVC4__THEORY__ARITH__ARITH_REWRITER_H
+#define CVC4__THEORY__ARITH__ARITH_REWRITER_H
 
 #include "theory/theory.h"
 #include "theory/rewriter.h"
@@ -76,4 +76,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__ARITH_REWRITER_H */
+#endif /* CVC4__THEORY__ARITH__ARITH_REWRITER_H */

diff --git a/src/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h
index d5f432187940ad6193ef4b68c8a03d141e268083..bc77f8ec022abb50647d23998ca8f8a22ab905f9 100644 (file)
--- a/src/theory/arith/arith_static_learner.h
+++ b/src/theory/arith/arith_static_learner.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H
-#define __CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H
+#ifndef CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H
+#define CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H
 
 #include <set>
 
@@ -72,4 +72,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H */
+#endif /* CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H */

diff --git a/src/theory/arith/arith_utilities.h b/src/theory/arith/arith_utilities.h
index aabc5326d12d8b6f7a2f2b156a63ec599a0e5051..c8e92dfd336f256b4cf3a269227bb6d5825f40fb 100644 (file)
--- a/src/theory/arith/arith_utilities.h
+++ b/src/theory/arith/arith_utilities.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__ARITH_UTILITIES_H
-#define __CVC4__THEORY__ARITH__ARITH_UTILITIES_H
+#ifndef CVC4__THEORY__ARITH__ARITH_UTILITIES_H
+#define CVC4__THEORY__ARITH__ARITH_UTILITIES_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -307,4 +307,4 @@ inline Node mkPi()
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__ARITH_UTILITIES_H */
+#endif /* CVC4__THEORY__ARITH__ARITH_UTILITIES_H */

diff --git a/src/theory/arith/arithvar_node_map.h b/src/theory/arith/arithvar_node_map.h
index 308d63b0c5d0766a8cfd3d6d2d490133eefb258e..03b061504ce2efdeba087f5bb2fcaf8cc0ee5dec 100644 (file)
--- a/src/theory/arith/arithvar_node_map.h
+++ b/src/theory/arith/arithvar_node_map.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H
-#define __CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H
+#ifndef CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H
+#define CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H
 
 
 #include "theory/arith/arithvar.h"
@@ -92,4 +92,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H */
+#endif /* CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H */

diff --git a/src/theory/arith/constraint.h b/src/theory/arith/constraint.h
index 36a347feb4f0290d311b7ec1053e740e8217ebee..f2c0c4b02d34fec228b7e227602cb87968250c94 100644 (file)
--- a/src/theory/arith/constraint.h
+++ b/src/theory/arith/constraint.h
@@ -72,8 +72,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__CONSTRAINT_H
-#define __CVC4__THEORY__ARITH__CONSTRAINT_H
+#ifndef CVC4__THEORY__ARITH__CONSTRAINT_H
+#define CVC4__THEORY__ARITH__CONSTRAINT_H
 
 #include <unordered_map>
 #include <list>
@@ -1209,4 +1209,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__CONSTRAINT_H */
+#endif /* CVC4__THEORY__ARITH__CONSTRAINT_H */

diff --git a/src/theory/arith/constraint_forward.h b/src/theory/arith/constraint_forward.h
index 4be468f808c42bba722aeb0fa5a7c93292a21ede..5f3f2251daa03e4c6485c9e6e026b244fad26721 100644 (file)
--- a/src/theory/arith/constraint_forward.h
+++ b/src/theory/arith/constraint_forward.h
@@ -16,8 +16,8 @@
  ** minimize interaction between header files.
  **/
 
-#ifndef __CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H
-#define __CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H
+#ifndef CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H
+#define CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H
 
 #include "cvc4_private.h"
 #include <vector>
@@ -46,4 +46,4 @@ static const RationalVectorP RationalVectorPSentinel = NULL;
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H */
+#endif /* CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H */

diff --git a/src/theory/arith/dio_solver.h b/src/theory/arith/dio_solver.h
index a7842ddb2a27eefa8c987cdedce7f472a837c611..0c26f9c55dae9e626546d4a9cfd1d100f8d4bd35 100644 (file)
--- a/src/theory/arith/dio_solver.h
+++ b/src/theory/arith/dio_solver.h
@@ -17,8 +17,8 @@
 #include "cvc4_private.h"
 
 
-#ifndef __CVC4__THEORY__ARITH__DIO_SOLVER_H
-#define __CVC4__THEORY__ARITH__DIO_SOLVER_H
+#ifndef CVC4__THEORY__ARITH__DIO_SOLVER_H
+#define CVC4__THEORY__ARITH__DIO_SOLVER_H
 
 #include <unordered_map>
 #include <utility>
@@ -423,4 +423,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__DIO_SOLVER_H */
+#endif /* CVC4__THEORY__ARITH__DIO_SOLVER_H */

diff --git a/src/theory/arith/nonlinear_extension.h b/src/theory/arith/nonlinear_extension.h
index 043aa0db700fad7a668f149fb474b5fb21bc2d58..7452e322b6bc9e25198c8b19e43a00432c616243 100644 (file)
--- a/src/theory/arith/nonlinear_extension.h
+++ b/src/theory/arith/nonlinear_extension.h
@@ -15,8 +15,8 @@
  ** multiplication via axiom instantiations.
  **/
 
-#ifndef __CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H
-#define __CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H
+#ifndef CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H
+#define CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H
 
 #include <stdint.h>
 
@@ -1013,4 +1013,4 @@ class NonlinearExtension {
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H */
+#endif /* CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H */

diff --git a/src/theory/arith/normal_form.h b/src/theory/arith/normal_form.h
index 36f8f20ad0d14d4ff25b52a2edd756c809c5a84b..a3d173cc776768246bb25996c9344cdfabbfc768 100644 (file)
--- a/src/theory/arith/normal_form.h
+++ b/src/theory/arith/normal_form.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__NORMAL_FORM_H
-#define __CVC4__THEORY__ARITH__NORMAL_FORM_H
+#ifndef CVC4__THEORY__ARITH__NORMAL_FORM_H
+#define CVC4__THEORY__ARITH__NORMAL_FORM_H
 
 #include <algorithm>
 #include <list>
@@ -1393,4 +1393,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__NORMAL_FORM_H */
+#endif /* CVC4__THEORY__ARITH__NORMAL_FORM_H */

diff --git a/src/theory/arith/partial_model.h b/src/theory/arith/partial_model.h
index 6bc01f2f2dda180b14e5e8b8f468442dfa21ac0e..5006c6a9ca1131b554264a1849a42cd33eee5835 100644 (file)
--- a/src/theory/arith/partial_model.h
+++ b/src/theory/arith/partial_model.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__PARTIAL_MODEL_H
-#define __CVC4__THEORY__ARITH__PARTIAL_MODEL_H
+#ifndef CVC4__THEORY__ARITH__PARTIAL_MODEL_H
+#define CVC4__THEORY__ARITH__PARTIAL_MODEL_H
 
 #include <list>
 #include <vector>
@@ -416,4 +416,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__PARTIAL_MODEL_H */
+#endif /* CVC4__THEORY__ARITH__PARTIAL_MODEL_H */

diff --git a/src/theory/arith/theory_arith_type_rules.h b/src/theory/arith/theory_arith_type_rules.h
index b75563f76fc94584bab1991f640904335b0a5178..c32b612e221e152d53898c75db9895f293cfd267 100644 (file)
--- a/src/theory/arith/theory_arith_type_rules.h
+++ b/src/theory/arith/theory_arith_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H
-#define __CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H
+#ifndef CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H
+#define CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H
 
 namespace CVC4 {
 namespace theory {
@@ -185,4 +185,4 @@ class DivisibleOpTypeRule
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H */
+#endif /* CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H */

diff --git a/src/theory/arith/type_enumerator.h b/src/theory/arith/type_enumerator.h
index 2a6d557158d5edda34683bcc287222531c15e693..5c6bf63ced3b9de6328a87090103b02c4daa49d4 100644 (file)
--- a/src/theory/arith/type_enumerator.h
+++ b/src/theory/arith/type_enumerator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H
 
 #include "expr/kind.h"
 #include "expr/type_node.h"
@@ -104,4 +104,4 @@ class IntegerEnumerator : public TypeEnumeratorBase<IntegerEnumerator> {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H */

diff --git a/src/theory/arrays/array_info.h b/src/theory/arrays/array_info.h
index c221569bbcf7da8f86f4c5652ac0b218bb90fbcf..7e18f9ed2d477a25db74bc0c4ee8f55252ca72cc 100644 (file)
--- a/src/theory/arrays/array_info.h
+++ b/src/theory/arrays/array_info.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARRAYS__ARRAY_INFO_H
-#define __CVC4__THEORY__ARRAYS__ARRAY_INFO_H
+#ifndef CVC4__THEORY__ARRAYS__ARRAY_INFO_H
+#define CVC4__THEORY__ARRAYS__ARRAY_INFO_H
 
 #include <iostream>
 #include <map>
@@ -211,4 +211,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARRAYS__ARRAY_INFO_H */
+#endif /* CVC4__THEORY__ARRAYS__ARRAY_INFO_H */

diff --git a/src/theory/arrays/array_proof_reconstruction.h b/src/theory/arrays/array_proof_reconstruction.h
index 3c656de1a0140d1854d5be74933676562688384e..37b014d35c975446fc053c9213564f2cd9edc531 100644 (file)
--- a/src/theory/arrays/array_proof_reconstruction.h
+++ b/src/theory/arrays/array_proof_reconstruction.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H
-#define __CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H
+#ifndef CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H
+#define CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H
 
 #include "theory/uf/equality_engine.h"
 
@@ -56,4 +56,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H */
+#endif /* CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H */

diff --git a/src/theory/arrays/static_fact_manager.h b/src/theory/arrays/static_fact_manager.h
index 135e46790c9becee7928ca06b81c60bddf312a26..6b68edf26ca0bff4cc26e7d5acb9607ed43dde82 100644 (file)
--- a/src/theory/arrays/static_fact_manager.h
+++ b/src/theory/arrays/static_fact_manager.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H
-#define __CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H
+#ifndef CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H
+#define CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H
 
 #include <utility>
 #include <vector>
@@ -113,4 +113,4 @@ inline void StaticFactManager::setCanon(TNode n, TNode newParent) {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /*__CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H */
+#endif /*CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H */

diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h
index 51e95844f5ee1a33a898fa7d608fdc22f1c9d0fb..be80a081df1ffe887d8231c7c87b4051c27438c6 100644 (file)
--- a/src/theory/arrays/theory_arrays.h
+++ b/src/theory/arrays/theory_arrays.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H
-#define __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H
+#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H
+#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H
 
 #include <tuple>
 #include <unordered_map>
@@ -491,4 +491,4 @@ class TheoryArrays : public Theory {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H */
+#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H */

diff --git a/src/theory/arrays/theory_arrays_rewriter.h b/src/theory/arrays/theory_arrays_rewriter.h
index 21cc56dbc3bb314453c092694420ad8c828bbef4..5f3fcf48d7754ede304c92fea7d29f432e6727f3 100644 (file)
--- a/src/theory/arrays/theory_arrays_rewriter.h
+++ b/src/theory/arrays/theory_arrays_rewriter.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H
-#define __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H
+#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H
+#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -509,4 +509,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H */
+#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H */

diff --git a/src/theory/arrays/theory_arrays_type_rules.h b/src/theory/arrays/theory_arrays_type_rules.h
index e789b8445e1a9524c0f930bcd839f196beb3aff0..78756176d17af49c5ee4d455e2f9944ad567b00f 100644 (file)
--- a/src/theory/arrays/theory_arrays_type_rules.h
+++ b/src/theory/arrays/theory_arrays_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H
-#define __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H
+#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H
+#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H
 
 #include "theory/arrays/theory_arrays_rewriter.h" // for array-constant attributes
 #include "theory/type_enumerator.h"
@@ -227,4 +227,4 @@ struct ArrayPartialSelectTypeRule {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H */
+#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H */

diff --git a/src/theory/arrays/type_enumerator.h b/src/theory/arrays/type_enumerator.h
index 2e09763e47b98867164d4962e5a17c0dd5eccdfb..5ca156b2e184bea8eadc20e6e6497105f6ed9f00 100644 (file)
--- a/src/theory/arrays/type_enumerator.h
+++ b/src/theory/arrays/type_enumerator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H
 
 #include "theory/type_enumerator.h"
 #include "expr/type_node.h"
@@ -158,4 +158,4 @@ class ArrayEnumerator : public TypeEnumeratorBase<ArrayEnumerator> {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H */

diff --git a/src/theory/arrays/union_find.h b/src/theory/arrays/union_find.h
index 5b552c7f8f320a2a54a6081be670dd82a2ec6d90..1f38f128006086fd9e2ed219e516c5e15bf27945 100644 (file)
--- a/src/theory/arrays/union_find.h
+++ b/src/theory/arrays/union_find.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ARRAYS__UNION_FIND_H
-#define __CVC4__THEORY__ARRAYS__UNION_FIND_H
+#ifndef CVC4__THEORY__ARRAYS__UNION_FIND_H
+#define CVC4__THEORY__ARRAYS__UNION_FIND_H
 
 #include <utility>
 #include <vector>
@@ -139,4 +139,4 @@ inline void UnionFind<NodeType, NodeHash>::setCanon(TNode n, TNode newParent) {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /*__CVC4__THEORY__ARRAYS__UNION_FIND_H */
+#endif /*CVC4__THEORY__ARRAYS__UNION_FIND_H */

diff --git a/src/theory/assertion.h b/src/theory/assertion.h
index d68ff87aab77438f770909e31eabf8b66f8649dd..863a7e893ba818b25c05dae388b85cb9fe0df1cc 100644 (file)
--- a/src/theory/assertion.h
+++ b/src/theory/assertion.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__ASSERTION_H
-#define __CVC4__THEORY__ASSERTION_H
+#ifndef CVC4__THEORY__ASSERTION_H
+#define CVC4__THEORY__ASSERTION_H
 
 #include "expr/node.h"
 
@@ -49,4 +49,4 @@ std::ostream& operator<<(std::ostream& out, const Assertion& a);
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__ASSERTION_H */
+#endif /* CVC4__THEORY__ASSERTION_H */

diff --git a/src/theory/booleans/circuit_propagator.h b/src/theory/booleans/circuit_propagator.h
index c5e1cc022a94e1df1a5c138ca74b26b744448a2a..9c479889809ec971349e085efca570ccbb4f4ef5 100644 (file)
--- a/src/theory/booleans/circuit_propagator.h
+++ b/src/theory/booleans/circuit_propagator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H
-#define __CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H
+#ifndef CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H
+#define CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H
 
 #include <functional>
 #include <unordered_map>
@@ -313,4 +313,4 @@ class CircuitPropagator
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H */
+#endif /* CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H */

diff --git a/src/theory/booleans/theory_bool.h b/src/theory/booleans/theory_bool.h
index 44abdf87dcf3112370aedc3a757eeb16f3436a19..abe0242824b8a61a5d6627f48ad591a336785397 100644 (file)
--- a/src/theory/booleans/theory_bool.h
+++ b/src/theory/booleans/theory_bool.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BOOLEANS__THEORY_BOOL_H
-#define __CVC4__THEORY__BOOLEANS__THEORY_BOOL_H
+#ifndef CVC4__THEORY__BOOLEANS__THEORY_BOOL_H
+#define CVC4__THEORY__BOOLEANS__THEORY_BOOL_H
 
 #include "theory/theory.h"
 #include "context/context.h"
@@ -44,4 +44,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BOOLEANS__THEORY_BOOL_H */
+#endif /* CVC4__THEORY__BOOLEANS__THEORY_BOOL_H */

diff --git a/src/theory/booleans/theory_bool_rewriter.cpp b/src/theory/booleans/theory_bool_rewriter.cpp
index d071e4e3dee7a546fc352d9060389966e4925adb..02267cf2cc3459c0a5e28195d360553ef31375e6 100644 (file)
--- a/src/theory/booleans/theory_bool_rewriter.cpp
+++ b/src/theory/booleans/theory_bool_rewriter.cpp
@@ -77,7 +77,7 @@ RewriteResponse flattenNode(TNode n, TNode trivialNode, TNode skipNode)
 
   /* Trickery to stay under number of children possible in a node */
   NodeManager* nodeManager = NodeManager::currentNM();
-  static const unsigned MAX_CHILDREN = (1u << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN ) - 1;
+  static const unsigned MAX_CHILDREN = (1u << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN ) - 1;
   if (childList.size() < MAX_CHILDREN) {
     Node retNode = nodeManager->mkNode(k, childList);
     return RewriteResponse(REWRITE_DONE, retNode);

diff --git a/src/theory/booleans/theory_bool_rewriter.h b/src/theory/booleans/theory_bool_rewriter.h
index 4aad1e63f7f96b56afe0af000f04b94a8134a075..250f36efada4e323154f585d9f8aa21e5b692a91 100644 (file)
--- a/src/theory/booleans/theory_bool_rewriter.h
+++ b/src/theory/booleans/theory_bool_rewriter.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H
-#define __CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H
+#ifndef CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H
+#define CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H
 
 #include "theory/rewriter.h"
 
@@ -42,4 +42,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H */
+#endif /* CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H */

diff --git a/src/theory/booleans/theory_bool_type_rules.h b/src/theory/booleans/theory_bool_type_rules.h
index 427a1addbe6fd928c8d78882f86a3fc33199c1bd..18329b8b911c388fc58b78808c92174013c7295b 100644 (file)
--- a/src/theory/booleans/theory_bool_type_rules.h
+++ b/src/theory/booleans/theory_bool_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY_BOOL_TYPE_RULES_H
-#define __CVC4__THEORY_BOOL_TYPE_RULES_H
+#ifndef CVC4__THEORY_BOOL_TYPE_RULES_H
+#define CVC4__THEORY_BOOL_TYPE_RULES_H
 
 namespace CVC4 {
 namespace theory {
@@ -74,4 +74,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY_BOOL_TYPE_RULES_H */
+#endif /* CVC4__THEORY_BOOL_TYPE_RULES_H */

diff --git a/src/theory/booleans/type_enumerator.h b/src/theory/booleans/type_enumerator.h
index 9628ee6e28444f8e90933c61ce74763697adbb01..361216b1057051044a460caaaf511d120959e8ff 100644 (file)
--- a/src/theory/booleans/type_enumerator.h
+++ b/src/theory/booleans/type_enumerator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H
 
 #include "theory/type_enumerator.h"
 #include "expr/type_node.h"
@@ -67,4 +67,4 @@ class BooleanEnumerator : public TypeEnumeratorBase<BooleanEnumerator> {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H */

diff --git a/src/theory/builtin/theory_builtin.h b/src/theory/builtin/theory_builtin.h
index 3b2a57397eaa6a026eeb42908ee01c70cf21ad33..8a7d1bf7b0d88026f677cff96a86da54d9441614 100644 (file)
--- a/src/theory/builtin/theory_builtin.h
+++ b/src/theory/builtin/theory_builtin.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H
-#define __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H
+#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H
+#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H
 
 #include "theory/theory.h"
 
@@ -38,4 +38,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H */
+#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H */

diff --git a/src/theory/builtin/theory_builtin_rewriter.h b/src/theory/builtin/theory_builtin_rewriter.h
index 2fe91e8cbbf3c3c4b3ee4f53208ffe44e26e5acb..5f703fa00d6d2e9380b97d8ec21784686eda47b1 100644 (file)
--- a/src/theory/builtin/theory_builtin_rewriter.h
+++ b/src/theory/builtin/theory_builtin_rewriter.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H
-#define __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H
+#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H
+#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H
 
 #include "theory/rewriter.h"
 #include "theory/theory.h"
@@ -130,4 +130,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H */
+#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H */

diff --git a/src/theory/builtin/theory_builtin_type_rules.h b/src/theory/builtin/theory_builtin_type_rules.h
index adeec48a96d37dea0dfb8093f511c064313ec4f3..2c726d12fe059e759984b0e012ddfd089360aa02 100644 (file)
--- a/src/theory/builtin/theory_builtin_type_rules.h
+++ b/src/theory/builtin/theory_builtin_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H
-#define __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H
+#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H
+#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H
 
 #include "expr/node.h"
 #include "expr/type_node.h"
@@ -375,4 +375,4 @@ class SExprProperties {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H */
+#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H */

diff --git a/src/theory/builtin/type_enumerator.h b/src/theory/builtin/type_enumerator.h
index 63c34161cdf04366bae38209d544e5921be6ee9a..8ce17306f383ce49ddcbdd775f1d55996396528c 100644 (file)
--- a/src/theory/builtin/type_enumerator.h
+++ b/src/theory/builtin/type_enumerator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H
 
 #include "expr/kind.h"
 #include "expr/type_node.h"
@@ -108,4 +108,4 @@ class FunctionEnumerator : public TypeEnumeratorBase<FunctionEnumerator>
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BUILTIN_TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__BUILTIN_TYPE_ENUMERATOR_H */

diff --git a/src/theory/bv/abstraction.h b/src/theory/bv/abstraction.h
index 09e3ce10c1f302535e276d37f1a0201c7ab212bd..5472aa5a20985c5e51de64ae60a636115bc6210b 100644 (file)
--- a/src/theory/bv/abstraction.h
+++ b/src/theory/bv/abstraction.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__ABSTRACTION_H
-#define __CVC4__THEORY__BV__ABSTRACTION_H
+#ifndef CVC4__THEORY__BV__ABSTRACTION_H
+#define CVC4__THEORY__BV__ABSTRACTION_H
 
 #include <unordered_map>
 #include <unordered_set>

diff --git a/src/theory/bv/bitblast/aig_bitblaster.h b/src/theory/bv/bitblast/aig_bitblaster.h
index cc821d3331207f181d8861db4530a59787f42436..8b63a9aa625f3a3c2ade0af8d38ac1d7cf2f66f4 100644 (file)
--- a/src/theory/bv/bitblast/aig_bitblaster.h
+++ b/src/theory/bv/bitblast/aig_bitblaster.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
-#define __CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
+#ifndef CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
+#define CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
 
 #include "theory/bv/bitblast/bitblaster.h"
 #include "prop/sat_solver.h"
@@ -111,4 +111,4 @@ class AigBitblaster : public TBitblaster<Abc_Obj_t*>
 }  // namespace bv
 }  // namespace theory
 }  // namespace CVC4
-#endif  //  __CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
+#endif  //  CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H

diff --git a/src/theory/bv/bitblast/bitblast_strategies_template.h b/src/theory/bv/bitblast/bitblast_strategies_template.h
index 6b8cafb7be1cf842d6e191b472241655173f5feb..9e668e258e1c1b42d41af52b4fd44dd4647bb166 100644 (file)
--- a/src/theory/bv/bitblast/bitblast_strategies_template.h
+++ b/src/theory/bv/bitblast/bitblast_strategies_template.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H
-#define __CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H
+#ifndef CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H
+#define CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H
 
 #include <cmath>
 #include <ostream>

diff --git a/src/theory/bv/bitblast/bitblast_utils.h b/src/theory/bv/bitblast/bitblast_utils.h
index a4c4261d28ca3c7e5ed67d0e4795aeac798a9705..f2bee22e57272520176932553edbd9961454d803 100644 (file)
--- a/src/theory/bv/bitblast/bitblast_utils.h
+++ b/src/theory/bv/bitblast/bitblast_utils.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
-#define __CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
+#ifndef CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
+#define CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
 
 
 #include <ostream>
@@ -269,4 +269,4 @@ T inline sLessThanBB(const std::vector<T>&a, const std::vector<T>& b, bool orEqu
 }  // namespace theory
 }  // namespace CVC4
 
-#endif  // __CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
+#endif  // CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H

diff --git a/src/theory/bv/bitblast/bitblaster.h b/src/theory/bv/bitblast/bitblaster.h
index f29882b0db20fd0b8a0831fced98c1d94ff133fb..df7cc4f115ddd92265c0539b339ce3c410023abe 100644 (file)
--- a/src/theory/bv/bitblast/bitblaster.h
+++ b/src/theory/bv/bitblast/bitblaster.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BITBLAST__BITBLASTER_H
-#define __CVC4__THEORY__BV__BITBLAST__BITBLASTER_H
+#ifndef CVC4__THEORY__BV__BITBLAST__BITBLASTER_H
+#define CVC4__THEORY__BV__BITBLAST__BITBLASTER_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -286,4 +286,4 @@ Node TBitblaster<T>::getTermModel(TNode node, bool fullModel)
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__BV__BITBLAST__BITBLASTER_H */
+#endif /* CVC4__THEORY__BV__BITBLAST__BITBLASTER_H */

diff --git a/src/theory/bv/bitblast/eager_bitblaster.h b/src/theory/bv/bitblast/eager_bitblaster.h
index 296014b7605e351ba2bc89bbdcda1651bb973be1..d407b8131e32fb79bab73062e86e8f2320cc2671 100644 (file)
--- a/src/theory/bv/bitblast/eager_bitblaster.h
+++ b/src/theory/bv/bitblast/eager_bitblaster.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
-#define __CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
+#ifndef CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
+#define CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
 
 #include <unordered_set>
 
@@ -88,4 +88,4 @@ class BitblastingRegistrar : public prop::Registrar
 }  // namespace bv
 }  // namespace theory
 }  // namespace CVC4
-#endif  //  __CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
+#endif  //  CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H

diff --git a/src/theory/bv/bitblast/lazy_bitblaster.h b/src/theory/bv/bitblast/lazy_bitblaster.h
index 920b669a6d4a92ab6992349ba89a6943aca3fd27..ac5cd5c7f734493bcf7890eae72640ca2800a6ee 100644 (file)
--- a/src/theory/bv/bitblast/lazy_bitblaster.h
+++ b/src/theory/bv/bitblast/lazy_bitblaster.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
-#define __CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
+#ifndef CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
+#define CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
 
 #include "proof/resolution_bitvector_proof.h"
 #include "theory/bv/bitblast/bitblaster.h"
@@ -176,4 +176,4 @@ class TLazyBitblaster : public TBitblaster<Node>
 }  // namespace bv
 }  // namespace theory
 }  // namespace CVC4
-#endif  //  __CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
+#endif  //  CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H

diff --git a/src/theory/bv/bv_eager_solver.h b/src/theory/bv/bv_eager_solver.h
index 5322cca9a6e98471e538c10cfaf702c8903f323c..8e42d5cabae912eac7c1624a4db02ec48d350242 100644 (file)
--- a/src/theory/bv/bv_eager_solver.h
+++ b/src/theory/bv/bv_eager_solver.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BV_EAGER_SOLVER_H
-#define __CVC4__THEORY__BV__BV_EAGER_SOLVER_H
+#ifndef CVC4__THEORY__BV__BV_EAGER_SOLVER_H
+#define CVC4__THEORY__BV__BV_EAGER_SOLVER_H
 
 #include <unordered_set>
 #include <vector>
@@ -68,4 +68,4 @@ class EagerBitblastSolver {
 }  // namespace theory
 }  // namespace CVC4
 
-#endif  // __CVC4__THEORY__BV__BV_EAGER_SOLVER_H
+#endif  // CVC4__THEORY__BV__BV_EAGER_SOLVER_H

diff --git a/src/theory/bv/bv_inequality_graph.h b/src/theory/bv/bv_inequality_graph.h
index a3a2f0445a40fd09aad69a1bc8776783f69e5bde..07facf4affca6ef5519df69e01746e6387a0b42e 100644 (file)
--- a/src/theory/bv/bv_inequality_graph.h
+++ b/src/theory/bv/bv_inequality_graph.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H
-#define __CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H
+#ifndef CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H
+#define CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H
 
 #include <list>
 #include <queue>
@@ -282,4 +282,4 @@ public:
 }
 }
 
-#endif /* __CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H */
+#endif /* CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H */

diff --git a/src/theory/bv/bv_quick_check.h b/src/theory/bv/bv_quick_check.h
index c1ac959467a5134780539d95d52c82fa4e3cc5ae..75f39b6e05cded005ddefa0f3d43503b2634ea3f 100644 (file)
--- a/src/theory/bv/bv_quick_check.h
+++ b/src/theory/bv/bv_quick_check.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BV_QUICK_CHECK_H
-#define __CVC4__BV_QUICK_CHECK_H
+#ifndef CVC4__BV_QUICK_CHECK_H
+#define CVC4__BV_QUICK_CHECK_H
 
 #include <vector>
 #include <unordered_set>
@@ -172,4 +172,4 @@ public:
 } /* theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__BV_QUICK_CHECK_H */
+#endif /* CVC4__BV_QUICK_CHECK_H */

diff --git a/src/theory/bv/bv_subtheory.h b/src/theory/bv/bv_subtheory.h
index 84a6f1b35aa1cc6b10adff34c40c45e12023cf00..60660eda9c8c106698b86eb08a8284435bdc78d8 100644 (file)
--- a/src/theory/bv/bv_subtheory.h
+++ b/src/theory/bv/bv_subtheory.h
@@ -14,8 +14,8 @@
  ** Interface for bit-vectors sub-solvers.
  **/
 
-#ifndef __CVC4__THEORY__BV__BV_SUBTHEORY_H
-#define __CVC4__THEORY__BV__BV_SUBTHEORY_H
+#ifndef CVC4__THEORY__BV__BV_SUBTHEORY_H
+#define CVC4__THEORY__BV__BV_SUBTHEORY_H
 
 #include "cvc4_private.h"
 #include "context/context.h"
@@ -117,4 +117,4 @@ class SubtheorySolver {
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__BV__BV_SUBTHEORY_H */
+#endif /* CVC4__THEORY__BV__BV_SUBTHEORY_H */

diff --git a/src/theory/bv/bv_subtheory_inequality.h b/src/theory/bv/bv_subtheory_inequality.h
index b64b229f9174052f5452bdcf0b575bd90ddee2fc..e18c886df9d5399ce728c19f6d9da6ec9c89ee58 100644 (file)
--- a/src/theory/bv/bv_subtheory_inequality.h
+++ b/src/theory/bv/bv_subtheory_inequality.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H
-#define __CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H
+#ifndef CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H
+#define CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H
 
 #include <unordered_set>
 
@@ -83,4 +83,4 @@ public:
 }
 }
 
-#endif /* __CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H */
+#endif /* CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H */

diff --git a/src/theory/bv/slicer.h b/src/theory/bv/slicer.h
index ec715d2f5077a7c31432eb0d418e54ab5f880389..3ddbcaf368777f76513a373b33bc4979489c3db5 100644 (file)
--- a/src/theory/bv/slicer.h
+++ b/src/theory/bv/slicer.h
@@ -28,8 +28,8 @@
 #include "util/index.h"
 #include "util/statistics_registry.h"
 
-#ifndef __CVC4__THEORY__BV__SLICER_BV_H
-#define __CVC4__THEORY__BV__SLICER_BV_H
+#ifndef CVC4__THEORY__BV__SLICER_BV_H
+#define CVC4__THEORY__BV__SLICER_BV_H
 
 
 namespace CVC4 {
@@ -251,4 +251,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BV__SLICER_BV_H */
+#endif /* CVC4__THEORY__BV__SLICER_BV_H */

diff --git a/src/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h
index 55aad0ba764864c21cf2cf1f4933c5dd1cd2772a..7ca98f2eaf65ef7e4142e3864bcf7934ef80a6c9 100644 (file)
--- a/src/theory/bv/theory_bv.h
+++ b/src/theory/bv/theory_bv.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__THEORY_BV_H
-#define __CVC4__THEORY__BV__THEORY_BV_H
+#ifndef CVC4__THEORY__BV__THEORY_BV_H
+#define CVC4__THEORY__BV__THEORY_BV_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -273,4 +273,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BV__THEORY_BV_H */
+#endif /* CVC4__THEORY__BV__THEORY_BV_H */

diff --git a/src/theory/bv/theory_bv_rewriter.h b/src/theory/bv/theory_bv_rewriter.h
index 8009daf3ccf04a573831b9fca41bd2619138597a..bf707c268e7e00076cc9124022e923a9e797e541 100644 (file)
--- a/src/theory/bv/theory_bv_rewriter.h
+++ b/src/theory/bv/theory_bv_rewriter.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__THEORY_BV_REWRITER_H
-#define __CVC4__THEORY__BV__THEORY_BV_REWRITER_H
+#ifndef CVC4__THEORY__BV__THEORY_BV_REWRITER_H
+#define CVC4__THEORY__BV__THEORY_BV_REWRITER_H
 
 #include "theory/rewriter.h"
 #include "util/statistics_registry.h"
@@ -109,4 +109,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BV__THEORY_BV_REWRITER_H */
+#endif /* CVC4__THEORY__BV__THEORY_BV_REWRITER_H */

diff --git a/src/theory/bv/theory_bv_type_rules.h b/src/theory/bv/theory_bv_type_rules.h
index 79c69b9f003c4cec52ab203d42a78b9af6857bb0..64d04a37e1098f3ade8d2de0bd07884f021b9536 100644 (file)
--- a/src/theory/bv/theory_bv_type_rules.h
+++ b/src/theory/bv/theory_bv_type_rules.h
@@ -18,8 +18,8 @@
 
 #include <algorithm>
 
-#ifndef __CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H
-#define __CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H
+#ifndef CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H
+#define CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H
 
 namespace CVC4 {
 namespace theory {
@@ -525,4 +525,4 @@ class BitVectorAckermanizationUremTypeRule
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H */
+#endif /* CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H */

diff --git a/src/theory/bv/type_enumerator.h b/src/theory/bv/type_enumerator.h
index 0bb67be42e16de1cef379edfca01bafd42c4144f..90aae339b7696819e3b0f8776e05ff3f9ec26aae 100644 (file)
--- a/src/theory/bv/type_enumerator.h
+++ b/src/theory/bv/type_enumerator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__BV__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__BV__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__BV__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__BV__TYPE_ENUMERATOR_H
 
 #include "expr/kind.h"
 #include "expr/type_node.h"
@@ -63,4 +63,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__BV__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__BV__TYPE_ENUMERATOR_H */

diff --git a/src/theory/care_graph.h b/src/theory/care_graph.h
index 12e63aa26d5fb756496ce0dfce267f988af866b2..55851c1a48400fc63b3fd05d4d85c1f4180cf130 100644 (file)
--- a/src/theory/care_graph.h
+++ b/src/theory/care_graph.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__CARE_GRAPH_H
-#define __CVC4__THEORY__CARE_GRAPH_H
+#ifndef CVC4__THEORY__CARE_GRAPH_H
+#define CVC4__THEORY__CARE_GRAPH_H
 
 #include <set>
 
@@ -59,4 +59,4 @@ typedef std::set<CarePair> CareGraph;
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__CARE_GRAPH_H */
+#endif /* CVC4__THEORY__CARE_GRAPH_H */

diff --git a/src/theory/datatypes/datatypes_rewriter.h b/src/theory/datatypes/datatypes_rewriter.h
index a6103a8c55234af2c28d10767686004a9605b195..6c1d64e5b77ef69c856e1f18a523d688a2c2ed1a 100644 (file)
--- a/src/theory/datatypes/datatypes_rewriter.h
+++ b/src/theory/datatypes/datatypes_rewriter.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H
-#define __CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H
+#ifndef CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H
+#define CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H
 
 #include "expr/node_manager_attributes.h"
 #include "options/datatypes_options.h"
@@ -258,4 +258,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H */
+#endif /* CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H */

diff --git a/src/theory/datatypes/datatypes_sygus.h b/src/theory/datatypes/datatypes_sygus.h
index b10ec169bac28f750e4f4ed96f2c69e141d974a6..95c259f2b0ceabd43dff7e48f74a4c2513aa807e 100644 (file)
--- a/src/theory/datatypes/datatypes_sygus.h
+++ b/src/theory/datatypes/datatypes_sygus.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__DATATYPES__DATATYPES_SYGUS_NEW_H
-#define __CVC4__THEORY__DATATYPES__DATATYPES_SYGUS_NEW_H
+#ifndef CVC4__THEORY__DATATYPES__DATATYPES_SYGUS_NEW_H
+#define CVC4__THEORY__DATATYPES__DATATYPES_SYGUS_NEW_H
 
 #include <iostream>
 #include <map>

diff --git a/src/theory/datatypes/sygus_simple_sym.h b/src/theory/datatypes/sygus_simple_sym.h
index 0a4ed0c6e6cb6b7cc77d3dee53a6b93d2e8230d1..815466d00a91305f7ae20a6781f500add8403db3 100644 (file)
--- a/src/theory/datatypes/sygus_simple_sym.h
+++ b/src/theory/datatypes/sygus_simple_sym.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H
-#define __CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H
+#ifndef CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H
+#define CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H
 
 #include <map>
 #include "theory/quantifiers/sygus/term_database_sygus.h"
@@ -104,4 +104,4 @@ class SygusSimpleSymBreak
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H */
+#endif /* CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H */

diff --git a/src/theory/datatypes/theory_datatypes.h b/src/theory/datatypes/theory_datatypes.h
index e5d037b384c8e57cd38fdbaa4c67548e5d6902e3..b4803e69ab8e91717bec1af0fdb4c698f85878de 100644 (file)
--- a/src/theory/datatypes/theory_datatypes.h
+++ b/src/theory/datatypes/theory_datatypes.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H
-#define __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H
+#ifndef CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H
+#define CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H
 
 #include <iostream>
 #include <map>
@@ -370,4 +370,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H */
+#endif /* CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H */

diff --git a/src/theory/datatypes/theory_datatypes_type_rules.h b/src/theory/datatypes/theory_datatypes_type_rules.h
index 6f76352096b41c60287f06418d37820015c80c85..22ac074f0d0ed9630abf5765239de89eebdb69ca 100644 (file)
--- a/src/theory/datatypes/theory_datatypes_type_rules.h
+++ b/src/theory/datatypes/theory_datatypes_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H
-#define __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H
+#ifndef CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H
+#define CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H
 
 #include "expr/matcher.h"
 //#include "expr/attribute.h"
@@ -433,4 +433,4 @@ class DtSyguEvalTypeRule
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H */
+#endif /* CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H */

diff --git a/src/theory/datatypes/type_enumerator.h b/src/theory/datatypes/type_enumerator.h
index fff4731f38c5ef41a59094e2b2183bb95075be38..a294324fae330486540a687162a34b631293a265 100644 (file)
--- a/src/theory/datatypes/type_enumerator.h
+++ b/src/theory/datatypes/type_enumerator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H
 
 #include "theory/type_enumerator.h"
 #include "expr/type_node.h"
@@ -185,4 +185,4 @@ class DatatypesEnumerator : public TypeEnumeratorBase<DatatypesEnumerator> {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H */

diff --git a/src/theory/decision_manager.h b/src/theory/decision_manager.h
index 1cf0e51154a27c2613ff34f693d5aa1e6eb01c6b..6825c1cf46667dda06b8b1b19dbdf63a05ae2475 100644 (file)
--- a/src/theory/decision_manager.h
+++ b/src/theory/decision_manager.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__DECISION_MANAGER__H
-#define __CVC4__THEORY__DECISION_MANAGER__H
+#ifndef CVC4__THEORY__DECISION_MANAGER__H
+#define CVC4__THEORY__DECISION_MANAGER__H
 
 #include <map>
 #include "theory/decision_strategy.h"
@@ -116,4 +116,4 @@ class DecisionManager
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__DECISION_MANAGER__H */
+#endif /* CVC4__THEORY__DECISION_MANAGER__H */

diff --git a/src/theory/decision_strategy.h b/src/theory/decision_strategy.h
index a01cf25c0b7be0df8227a18e2057259a70922e0b..65b80b7f6c6c97a7f9861627ed43e101a71b6d58 100644 (file)
--- a/src/theory/decision_strategy.h
+++ b/src/theory/decision_strategy.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__DECISION_STRATEGY__H
-#define __CVC4__THEORY__DECISION_STRATEGY__H
+#ifndef CVC4__THEORY__DECISION_STRATEGY__H
+#define CVC4__THEORY__DECISION_STRATEGY__H
 
 #include <map>
 #include "context/cdo.h"
@@ -143,4 +143,4 @@ class DecisionStrategySingleton : public DecisionStrategyFmf
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__DECISION_STRATEGY__H */
+#endif /* CVC4__THEORY__DECISION_STRATEGY__H */

diff --git a/src/theory/evaluator.h b/src/theory/evaluator.h
index fc96ea115dfc68c3eb4f1bc740ca8de96be1add6..5c0e9b94419f47179a5e193350e5871d19a4ba6d 100644 (file)
--- a/src/theory/evaluator.h
+++ b/src/theory/evaluator.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__EVALUATOR_H
-#define __CVC4__THEORY__EVALUATOR_H
+#ifndef CVC4__THEORY__EVALUATOR_H
+#define CVC4__THEORY__EVALUATOR_H
 
 #include <utility>
 #include <vector>
@@ -110,4 +110,4 @@ class Evaluator
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__EVALUATOR_H */
+#endif /* CVC4__THEORY__EVALUATOR_H */

diff --git a/src/theory/example/ecdata.h b/src/theory/example/ecdata.h
index 9941a6b89329df58d642b479a6c000712cc326e3..c646725e88e227f319086046f82aa73adabd362c 100644 (file)
--- a/src/theory/example/ecdata.h
+++ b/src/theory/example/ecdata.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__UF__TIM__ECDATA_H
-#define __CVC4__THEORY__UF__TIM__ECDATA_H
+#ifndef CVC4__THEORY__UF__TIM__ECDATA_H
+#define CVC4__THEORY__UF__TIM__ECDATA_H
 
 #include "expr/node.h"
 #include "context/context.h"
@@ -255,4 +255,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__UF__TIM__ECDATA_H */
+#endif /* CVC4__THEORY__UF__TIM__ECDATA_H */

diff --git a/src/theory/example/theory_uf_tim.h b/src/theory/example/theory_uf_tim.h
index ba9733a95758a7b9261ea31cdf8adf26f357cdb8..20fd6bcfbafa716ee9060a04afc00c1469b07a99 100644 (file)
--- a/src/theory/example/theory_uf_tim.h
+++ b/src/theory/example/theory_uf_tim.h
@@ -22,8 +22,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H
-#define __CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H
+#ifndef CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H
+#define CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H
 
 #include "expr/node.h"
 #include "expr/attribute.h"
@@ -210,4 +210,4 @@ typedef expr::Attribute<ECAttrTag, ECData*, ECCleanupStrategy> ECAttr;
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H */
+#endif /* CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H */

diff --git a/src/theory/ext_theory.h b/src/theory/ext_theory.h
index 0ad314f6f596b6207c16406f40143a67e7c0305d..7ac79a4d68801af521b31d725b4444f70e44aff2 100644 (file)
--- a/src/theory/ext_theory.h
+++ b/src/theory/ext_theory.h
@@ -30,8 +30,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__EXT_THEORY_H
-#define __CVC4__THEORY__EXT_THEORY_H
+#ifndef CVC4__THEORY__EXT_THEORY_H
+#define CVC4__THEORY__EXT_THEORY_H
 
 #include <map>
 #include <set>
@@ -247,4 +247,4 @@ class ExtTheory
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__EXT_THEORY_H */
+#endif /* CVC4__THEORY__EXT_THEORY_H */

diff --git a/src/theory/fp/fp_converter.h b/src/theory/fp/fp_converter.h
index 163da6facf7630d3c8cf0b78a9258654fc38c817..753030408a777509836b3c63a09630aa5e644e41 100644 (file)
--- a/src/theory/fp/fp_converter.h
+++ b/src/theory/fp/fp_converter.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__FP__FP_CONVERTER_H
-#define __CVC4__THEORY__FP__FP_CONVERTER_H
+#ifndef CVC4__THEORY__FP__FP_CONVERTER_H
+#define CVC4__THEORY__FP__FP_CONVERTER_H
 
 #include "base/cvc4_assert.h"
 #include "context/cdhashmap.h"
@@ -355,4 +355,4 @@ class FpConverter
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__FP__THEORY_FP_H */
+#endif /* CVC4__THEORY__FP__THEORY_FP_H */

diff --git a/src/theory/fp/theory_fp.h b/src/theory/fp/theory_fp.h
index 49d457d7a27fac725bad01c854b46ee0c419bcf8..ad093f924858e28060de57e81b6b13a33076eb90 100644 (file)
--- a/src/theory/fp/theory_fp.h
+++ b/src/theory/fp/theory_fp.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__FP__THEORY_FP_H
-#define __CVC4__THEORY__FP__THEORY_FP_H
+#ifndef CVC4__THEORY__FP__THEORY_FP_H
+#define CVC4__THEORY__FP__THEORY_FP_H
 
 #include <string>
 #include <utility>
@@ -148,4 +148,4 @@ class TheoryFp : public Theory {
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__FP__THEORY_FP_H */
+#endif /* CVC4__THEORY__FP__THEORY_FP_H */

diff --git a/src/theory/fp/theory_fp_rewriter.h b/src/theory/fp/theory_fp_rewriter.h
index ec042dfe921af40de555ebfa6c9602e63ce29e0f..fef97afea1ca8942dd9b4f1d9cd4e98b62758ccb 100644 (file)
--- a/src/theory/fp/theory_fp_rewriter.h
+++ b/src/theory/fp/theory_fp_rewriter.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__FP__THEORY_FP_REWRITER_H
-#define __CVC4__THEORY__FP__THEORY_FP_REWRITER_H
+#ifndef CVC4__THEORY__FP__THEORY_FP_REWRITER_H
+#define CVC4__THEORY__FP__THEORY_FP_REWRITER_H
 
 #include "theory/rewriter.h"
 
@@ -64,4 +64,4 @@ class TheoryFpRewriter {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__FP__THEORY_FP_REWRITER_H */
+#endif /* CVC4__THEORY__FP__THEORY_FP_REWRITER_H */

diff --git a/src/theory/fp/theory_fp_type_rules.h b/src/theory/fp/theory_fp_type_rules.h
index 3072476082d7a338d23c4b22e9970c15c40b318a..4022cc27841ed1c5fc740f1a7c2e71ff513fe9f9 100644 (file)
--- a/src/theory/fp/theory_fp_type_rules.h
+++ b/src/theory/fp/theory_fp_type_rules.h
@@ -20,8 +20,8 @@
 // This is only needed for checking that components are only applied to leaves.
 #include "theory/theory.h"
 
-#ifndef __CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H
-#define __CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H
+#ifndef CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H
+#define CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H
 
 namespace CVC4 {
 namespace theory {
@@ -806,4 +806,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H */
+#endif /* CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H */

diff --git a/src/theory/fp/type_enumerator.h b/src/theory/fp/type_enumerator.h
index cd73ff824a1ee1561aaf7df5651e8ed94b590d16..4494fd40f5939d32c86301a8a7c3316a67c4b853 100644 (file)
--- a/src/theory/fp/type_enumerator.h
+++ b/src/theory/fp/type_enumerator.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__FP__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__FP__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__FP__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__FP__TYPE_ENUMERATOR_H
 
 #include "expr/kind.h"
 #include "expr/type_node.h"
@@ -132,4 +132,4 @@ class RoundingModeEnumerator
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__FP__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__FP__TYPE_ENUMERATOR_H */

diff --git a/src/theory/interrupted.h b/src/theory/interrupted.h
index 291528a784bedf7892d570133b2c09b58a623d7a..905a9868949bc66acff53f5701b319dad1328c23 100644 (file)
--- a/src/theory/interrupted.h
+++ b/src/theory/interrupted.h
@@ -26,8 +26,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__INTERRUPTED_H
-#define __CVC4__THEORY__INTERRUPTED_H
+#ifndef CVC4__THEORY__INTERRUPTED_H
+#define CVC4__THEORY__INTERRUPTED_H
 
 #include "base/exception.h"
 
@@ -40,4 +40,4 @@ class Interrupted : public CVC4::Exception {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__INTERRUPTED_H */
+#endif /* CVC4__THEORY__INTERRUPTED_H */

diff --git a/src/theory/logic_info.h b/src/theory/logic_info.h
index 4c35b8d7f440775e86cd19104b070f51ec4a2077..a765472ddd58cb758613a0ca468afd7905e5d697 100644 (file)
--- a/src/theory/logic_info.h
+++ b/src/theory/logic_info.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__LOGIC_INFO_H
-#define __CVC4__LOGIC_INFO_H
+#ifndef CVC4__LOGIC_INFO_H
+#define CVC4__LOGIC_INFO_H
 
 #include <string>
 #include <vector>
@@ -279,4 +279,4 @@ std::ostream& operator<<(std::ostream& out, const LogicInfo& logic) CVC4_PUBLIC;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__LOGIC_INFO_H */
+#endif /* CVC4__LOGIC_INFO_H */

diff --git a/src/theory/output_channel.h b/src/theory/output_channel.h
index 38fd94003fad5fcdfe791de5f0abe2882b34fc5b..347177b93cf10334650dfb88b87191be18c38ab3 100644 (file)
--- a/src/theory/output_channel.h
+++ b/src/theory/output_channel.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__OUTPUT_CHANNEL_H
-#define __CVC4__THEORY__OUTPUT_CHANNEL_H
+#ifndef CVC4__THEORY__OUTPUT_CHANNEL_H
+#define CVC4__THEORY__OUTPUT_CHANNEL_H
 
 #include <memory>
 
@@ -194,4 +194,4 @@ class OutputChannel {
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__OUTPUT_CHANNEL_H */
+#endif /* CVC4__THEORY__OUTPUT_CHANNEL_H */

diff --git a/src/theory/quantifiers/alpha_equivalence.h b/src/theory/quantifiers/alpha_equivalence.h
index 5ab7d0fc2f6822ff8ccb4a030915209ad8e776a2..b5d68f233b51f8e250ebeeaabadc3989cca4d1c5 100644 (file)
--- a/src/theory/quantifiers/alpha_equivalence.h
+++ b/src/theory/quantifiers/alpha_equivalence.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__ALPHA_EQUIVALENCE_H
-#define __CVC4__ALPHA_EQUIVALENCE_H
+#ifndef CVC4__ALPHA_EQUIVALENCE_H
+#define CVC4__ALPHA_EQUIVALENCE_H
 
 
 #include "theory/quantifiers_engine.h"

diff --git a/src/theory/quantifiers/anti_skolem.h b/src/theory/quantifiers/anti_skolem.h
index e02c85866c0b702e5619e8c299f4eac4d2d99d0f..3a7dc2da848d0a7211730c1b1a2991a197a7705c 100644 (file)
--- a/src/theory/quantifiers/anti_skolem.h
+++ b/src/theory/quantifiers/anti_skolem.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANT_ANTI_SKOLEM_H
-#define __CVC4__THEORY__QUANT_ANTI_SKOLEM_H
+#ifndef CVC4__THEORY__QUANT_ANTI_SKOLEM_H
+#define CVC4__THEORY__QUANT_ANTI_SKOLEM_H
 
 #include <map>
 #include <vector>

diff --git a/src/theory/quantifiers/bv_inverter.h b/src/theory/quantifiers/bv_inverter.h
index b4cfe2bedf72113fad6ba0b0fc0663d3e10526b0..746bfba9a4e15d139f361570a63db9e9dd61c304 100644 (file)
--- a/src/theory/quantifiers/bv_inverter.h
+++ b/src/theory/quantifiers/bv_inverter.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BV_INVERTER_H
-#define __CVC4__BV_INVERTER_H
+#ifndef CVC4__BV_INVERTER_H
+#define CVC4__BV_INVERTER_H
 
 #include <map>
 #include <unordered_map>
@@ -130,4 +130,4 @@ class BvInverter
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__BV_INVERTER_H */
+#endif /* CVC4__BV_INVERTER_H */

diff --git a/src/theory/quantifiers/bv_inverter_utils.h b/src/theory/quantifiers/bv_inverter_utils.h
index 4ab677f0e28640331cc4f93a50fc77a9bff2f2f4..264b42ef560c217aee2bc0de582d1fb505e478e2 100644 (file)
--- a/src/theory/quantifiers/bv_inverter_utils.h
+++ b/src/theory/quantifiers/bv_inverter_utils.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BV_INVERTER_UTILS_H
-#define __CVC4__BV_INVERTER_UTILS_H
+#ifndef CVC4__BV_INVERTER_UTILS_H
+#define CVC4__BV_INVERTER_UTILS_H
 
 #include "expr/node.h"
 

diff --git a/src/theory/quantifiers/candidate_rewrite_database.h b/src/theory/quantifiers/candidate_rewrite_database.h
index 9daaa970ecdf4e139eb8f90031c1345021a41e1f..b68b20998ac5741adc1582ddf5559383c4e5748e 100644 (file)
--- a/src/theory/quantifiers/candidate_rewrite_database.h
+++ b/src/theory/quantifiers/candidate_rewrite_database.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H
-#define __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H
+#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H
 
 #include <map>
 #include <memory>
@@ -145,4 +145,4 @@ class CandidateRewriteDatabaseGen
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H */

diff --git a/src/theory/quantifiers/candidate_rewrite_filter.h b/src/theory/quantifiers/candidate_rewrite_filter.h
index 63d5d6fece10d66c39f9f36587cebec61de89833..af9ac6d87dced4f43b62d414b83dfa8ef5a515d7 100644 (file)
--- a/src/theory/quantifiers/candidate_rewrite_filter.h
+++ b/src/theory/quantifiers/candidate_rewrite_filter.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H
-#define __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H
+#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H
 
 #include <map>
 #include "theory/quantifiers/dynamic_rewrite.h"
@@ -223,4 +223,4 @@ class CandidateRewriteFilter
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */

diff --git a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h
index 5bc75f801ddec2dff8d3cf519e166584c11ef1a8..8799ce1cdbbaf7b0509416af254aa43ffff6ce17 100644 (file)
--- a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H
+#define CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H
 
 #include <vector>
 #include "expr/node.h"
@@ -203,4 +203,4 @@ class ArithInstantiator : public Instantiator
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H */

diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h
index b9c35b3e0c4206e3337c5892d2e7ee5f2c89760a..466eba6a249b7c98be1c8bcc90c9db3c9dc27cfe 100644 (file)
--- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H
+#define CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H
 
 #include <unordered_map>
 #include "theory/quantifiers/bv_inverter.h"
@@ -211,4 +211,4 @@ class BvInstantiatorPreprocess : public InstantiatorPreprocess
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H */

diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h
index 3156e745c44847b431b4e2bf4a5172b9ae910564..7c72a29f202b9955979700004c8d66e2a808843f 100644 (file)
--- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h
+++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BV_INSTANTIATOR_UTILS_H
-#define __CVC4__BV_INSTANTIATOR_UTILS_H
+#ifndef CVC4__BV_INSTANTIATOR_UTILS_H
+#define CVC4__BV_INSTANTIATOR_UTILS_H
 
 #include "expr/attribute.h"
 #include "expr/node.h"

diff --git a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h
index ea3db0e9b6cde77a552ad2a4b800accddf82b36b..cf9736abe7d81dd583362c7202b9ba9fca5d22a8 100644 (file)
--- a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H
+#define CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H
 
 #include "expr/node.h"
 #include "theory/quantifiers/cegqi/ceg_instantiator.h"
@@ -93,4 +93,4 @@ class DtInstantiator : public Instantiator
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H */

diff --git a/src/theory/quantifiers/cegqi/ceg_epr_instantiator.h b/src/theory/quantifiers/cegqi/ceg_epr_instantiator.h
index 2ed76ba27e3d1be1a3208036dcd9e85d528cab3e..05932de7e520ead2595d3d4867672f45a9c43f34 100644 (file)
--- a/src/theory/quantifiers/cegqi/ceg_epr_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_epr_instantiator.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H
+#define CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H
 
 #include <map>
 #include <vector>
@@ -106,4 +106,4 @@ class EprInstantiator : public Instantiator
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H */

diff --git a/src/theory/quantifiers/cegqi/ceg_instantiator.h b/src/theory/quantifiers/cegqi/ceg_instantiator.h
index a813c91b0d5e25bc1090a3ab6205d6126646a72c..0a09f39c75983aefaac70a8c5466188b90fdc110 100644 (file)
--- a/src/theory/quantifiers/cegqi/ceg_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_instantiator.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H
+#define CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H
 
 #include "theory/quantifiers_engine.h"
 #include "util/statistics_registry.h"

diff --git a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h
index c5c90b64addc391c27e5483346433129f539eace..ebebb808d1437ceed002924f56df22792ef4e342 100644 (file)
--- a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h
+++ b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H
-#define __CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H
+#ifndef CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H
+#define CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H
 
 #include "theory/decision_manager.h"
 #include "theory/quantifiers/cegqi/ceg_instantiator.h"

diff --git a/src/theory/quantifiers/dynamic_rewrite.h b/src/theory/quantifiers/dynamic_rewrite.h
index 6d0a1625cc9adb60eeed8136c6dca188e129fce7..969b6bf9348ce558324af4e562bd109c3176e1b6 100644 (file)
--- a/src/theory/quantifiers/dynamic_rewrite.h
+++ b/src/theory/quantifiers/dynamic_rewrite.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H
-#define __CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H
+#define CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H
 
 #include <map>
 
@@ -121,4 +121,4 @@ class DynamicRewriter
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H */

diff --git a/src/theory/quantifiers/ematching/candidate_generator.h b/src/theory/quantifiers/ematching/candidate_generator.h
index d2718fa1fb6635d6d5de389bb52db669ffe58c98..8cff124777cb38827ce23da8b124a399e4a8aba1 100644 (file)
--- a/src/theory/quantifiers/ematching/candidate_generator.h
+++ b/src/theory/quantifiers/ematching/candidate_generator.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H
+#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H
 
 #include "theory/theory.h"
 #include "theory/uf/equality_engine.h"
@@ -212,4 +212,4 @@ class CandidateGeneratorConsExpand : public CandidateGeneratorQE
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H */

diff --git a/src/theory/quantifiers/ematching/ho_trigger.h b/src/theory/quantifiers/ematching/ho_trigger.h
index b57db57998beb9265e6e241818ade7fd2359f71e..6f0ff06356fa29cf1d0d0e313d525e5082693390 100644 (file)
--- a/src/theory/quantifiers/ematching/ho_trigger.h
+++ b/src/theory/quantifiers/ematching/ho_trigger.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H
-#define __CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H
+#define CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H
 
 #include <map>
 #include <unordered_set>
@@ -275,4 +275,4 @@ class HigherOrderTrigger : public Trigger
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H */

diff --git a/src/theory/quantifiers/ematching/inst_match_generator.h b/src/theory/quantifiers/ematching/inst_match_generator.h
index f9fd2be256085650b8158e0da4ebe8cac0b78407..3995c67b418ce39358074d386eb3fe12974450ad 100644 (file)
--- a/src/theory/quantifiers/ematching/inst_match_generator.h
+++ b/src/theory/quantifiers/ematching/inst_match_generator.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H
+#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H
 
 #include <map>
 #include "expr/node_trie.h"

diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h
index d715d7f7a0f6bf45c3b16f85aa87b6e04b3d9ce5..5eb992368246be29bb7a6d1fe31cb7652e500638 100644 (file)
--- a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h
+++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__INST_STRATEGY_E_MATCHING_H
-#define __CVC4__INST_STRATEGY_E_MATCHING_H
+#ifndef CVC4__INST_STRATEGY_E_MATCHING_H
+#define CVC4__INST_STRATEGY_E_MATCHING_H
 
 #include "context/context.h"
 #include "context/context_mm.h"

diff --git a/src/theory/quantifiers/ematching/instantiation_engine.h b/src/theory/quantifiers/ematching/instantiation_engine.h
index cd82e67a3c26ed49d69f065658203eeca7583495..139adcb0468f98ddc43cc956a438b5167414fabc 100644 (file)
--- a/src/theory/quantifiers/ematching/instantiation_engine.h
+++ b/src/theory/quantifiers/ematching/instantiation_engine.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H
-#define __CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H
+#define CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H
 
 #include <memory>
 
@@ -95,4 +95,4 @@ class InstantiationEngine : public QuantifiersModule {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */

diff --git a/src/theory/quantifiers/ematching/trigger.h b/src/theory/quantifiers/ematching/trigger.h
index 9a65f0c02be23eecada72d13d463ff84495c642c..f276585d6375612a5927ae430299310f75653e30 100644 (file)
--- a/src/theory/quantifiers/ematching/trigger.h
+++ b/src/theory/quantifiers/ematching/trigger.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__TRIGGER_H
-#define __CVC4__THEORY__QUANTIFIERS__TRIGGER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__TRIGGER_H
+#define CVC4__THEORY__QUANTIFIERS__TRIGGER_H
 
 #include <map>
 
@@ -464,4 +464,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__TRIGGER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__TRIGGER_H */

diff --git a/src/theory/quantifiers/equality_infer.h b/src/theory/quantifiers/equality_infer.h
index be1d6d81d59deb2f63695b7a2ff61503c2c30ad4..69cd12a7025fd803e532a003d8745a08a6aab56c 100644 (file)
--- a/src/theory/quantifiers/equality_infer.h
+++ b/src/theory/quantifiers/equality_infer.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__EQUALITY_INFER_H
-#define __CVC4__THEORY__QUANTIFIERS__EQUALITY_INFER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__EQUALITY_INFER_H
+#define CVC4__THEORY__QUANTIFIERS__EQUALITY_INFER_H
 
 #include <iostream>
 #include <map>

diff --git a/src/theory/quantifiers/equality_query.h b/src/theory/quantifiers/equality_query.h
index 9b62c5714d2c262df2d4209be6934cb537bc5139..e4eeeffa71c38c2d23ad8b01dff8fce3bca41233 100644 (file)
--- a/src/theory/quantifiers/equality_query.h
+++ b/src/theory/quantifiers/equality_query.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H
-#define __CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H
+#ifndef CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H
+#define CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H
 
 #include "context/cdo.h"
 #include "context/context.h"
@@ -120,4 +120,4 @@ class EqualityQueryQuantifiersEngine : public EqualityQuery
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H */
+#endif /* CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H */

diff --git a/src/theory/quantifiers/expr_miner.h b/src/theory/quantifiers/expr_miner.h
index 9420b495afd72b9195dba8d17020e02d63d98562..233ef39f78f832a636085b117646bc93c69b18a9 100644 (file)
--- a/src/theory/quantifiers/expr_miner.h
+++ b/src/theory/quantifiers/expr_miner.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H
-#define __CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H
+#define CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H
 
 #include <map>
 #include <memory>
@@ -106,4 +106,4 @@ class ExprMiner
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H */

diff --git a/src/theory/quantifiers/expr_miner_manager.h b/src/theory/quantifiers/expr_miner_manager.h
index dc0a8fab534e861468b30f3907629d215e6a3c9a..1c8aab82690faf5f5a6f7122a6d014d430f22c47 100644 (file)
--- a/src/theory/quantifiers/expr_miner_manager.h
+++ b/src/theory/quantifiers/expr_miner_manager.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H
-#define __CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H
+#define CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H
 
 #include "expr/node.h"
 #include "theory/quantifiers/candidate_rewrite_database.h"
@@ -120,4 +120,4 @@ class ExpressionMinerManager
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H */

diff --git a/src/theory/quantifiers/extended_rewrite.h b/src/theory/quantifiers/extended_rewrite.h
index 920732e0fd43794e23571112cdf33d035ef5a7e3..836e15b7b386ab9133dd3bc08895cc6e12ecc168 100644 (file)
--- a/src/theory/quantifiers/extended_rewrite.h
+++ b/src/theory/quantifiers/extended_rewrite.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H
-#define __CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H
+#define CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H
 
 #include <unordered_map>
 
@@ -250,4 +250,4 @@ class ExtendedRewriter
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H */

diff --git a/src/theory/quantifiers/first_order_model.h b/src/theory/quantifiers/first_order_model.h
index dc257ea0aeb4badbb17c69b81cc972e9cb0f2bc1..bdf1d7c155c541262cc8593779ef17fe705a7fd8 100644 (file)
--- a/src/theory/quantifiers/first_order_model.h
+++ b/src/theory/quantifiers/first_order_model.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__FIRST_ORDER_MODEL_H
-#define __CVC4__FIRST_ORDER_MODEL_H
+#ifndef CVC4__FIRST_ORDER_MODEL_H
+#define CVC4__FIRST_ORDER_MODEL_H
 
 #include "theory/theory_model.h"
 #include "theory/uf/theory_uf_model.h"
@@ -218,4 +218,4 @@ class FirstOrderModelFmc : public FirstOrderModel
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__FIRST_ORDER_MODEL_H */
+#endif /* CVC4__FIRST_ORDER_MODEL_H */

diff --git a/src/theory/quantifiers/fmf/bounded_integers.h b/src/theory/quantifiers/fmf/bounded_integers.h
index 1eab28fd984839bc10a03162b656b7be256ec6cf..55ed5bdd2f9e9cee68f7ee0b6452d4a8881c9ca8 100644 (file)
--- a/src/theory/quantifiers/fmf/bounded_integers.h
+++ b/src/theory/quantifiers/fmf/bounded_integers.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BOUNDED_INTEGERS_H
-#define __CVC4__BOUNDED_INTEGERS_H
+#ifndef CVC4__BOUNDED_INTEGERS_H
+#define CVC4__BOUNDED_INTEGERS_H
 
 
 #include "theory/quantifiers_engine.h"

diff --git a/src/theory/quantifiers/fmf/full_model_check.h b/src/theory/quantifiers/fmf/full_model_check.h
index d662898c3862317881c063e89668933332836796..7dd1991f5b556a9da7a70d0033df570da2d7a888 100644 (file)
--- a/src/theory/quantifiers/fmf/full_model_check.h
+++ b/src/theory/quantifiers/fmf/full_model_check.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H
-#define __CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H
+#ifndef CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H
+#define CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H
 
 #include "theory/quantifiers/fmf/model_builder.h"
 #include "theory/quantifiers/first_order_model.h"
@@ -162,4 +162,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H */

diff --git a/src/theory/quantifiers/fmf/model_builder.h b/src/theory/quantifiers/fmf/model_builder.h
index b5f9c809a0665c0602fa536b41651898bafde9a3..1b4d24779c370ab6de54c0677cb492a49834a5de 100644 (file)
--- a/src/theory/quantifiers/fmf/model_builder.h
+++ b/src/theory/quantifiers/fmf/model_builder.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H
-#define __CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H
+#define CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H
 
 #include "theory/quantifiers_engine.h"
 #include "theory/theory_model_builder.h"
@@ -60,4 +60,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H */

diff --git a/src/theory/quantifiers/fmf/model_engine.h b/src/theory/quantifiers/fmf/model_engine.h
index 4202988aea9116cbbbf3a9c9680ea7621b5a572e..41bc312e7e9c861bbd08d1af12a06a057209ed85 100644 (file)
--- a/src/theory/quantifiers/fmf/model_engine.h
+++ b/src/theory/quantifiers/fmf/model_engine.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H
-#define __CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H
+#define CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H
 
 #include "theory/quantifiers_engine.h"
 #include "theory/quantifiers/fmf/model_builder.h"
@@ -67,4 +67,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H */

diff --git a/src/theory/quantifiers/fun_def_process.h b/src/theory/quantifiers/fun_def_process.h
index f455d4a47186fbad2e274ed06eff7048ff60eaa3..0282f0e407fcc61d103838836f45e3f6722cffcc 100644 (file)
--- a/src/theory/quantifiers/fun_def_process.h
+++ b/src/theory/quantifiers/fun_def_process.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__QUANTIFIERS_FUN_DEF_PROCESS_H
-#define __CVC4__QUANTIFIERS_FUN_DEF_PROCESS_H
+#ifndef CVC4__QUANTIFIERS_FUN_DEF_PROCESS_H
+#define CVC4__QUANTIFIERS_FUN_DEF_PROCESS_H
 
 #include <iostream>
 #include <string>

diff --git a/src/theory/quantifiers/inst_match.h b/src/theory/quantifiers/inst_match.h
index db2f7b8a02c9716d527f64e15c3f410908bc84c1..d298c43a8d52b5264082b19cf00d9463b36d39b3 100644 (file)
--- a/src/theory/quantifiers/inst_match.h
+++ b/src/theory/quantifiers/inst_match.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__INST_MATCH_H
-#define __CVC4__THEORY__QUANTIFIERS__INST_MATCH_H
+#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_H
+#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_H
 
 #include <vector>
 
@@ -102,4 +102,4 @@ typedef CVC4::theory::inst::InstMatch InstMatch;
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */

diff --git a/src/theory/quantifiers/inst_match_trie.h b/src/theory/quantifiers/inst_match_trie.h
index 6f5b16bb1265e60880750c6a4f838b98b6eac44e..4854616db5fa3b5eae6d8a98d7dc1fa69a3cb725 100644 (file)
--- a/src/theory/quantifiers/inst_match_trie.h
+++ b/src/theory/quantifiers/inst_match_trie.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H
-#define __CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H
+#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H
 
 #include <map>
 
@@ -436,4 +436,4 @@ class InstMatchTrieOrdered
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */

diff --git a/src/theory/quantifiers/inst_propagator.h b/src/theory/quantifiers/inst_propagator.h
index d82991b0aa8cba2397440b0a8d5df2a6d38532ae..d45b078ce9166b1874d34037d389694732045731 100644 (file)
--- a/src/theory/quantifiers/inst_propagator.h
+++ b/src/theory/quantifiers/inst_propagator.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__QUANTIFIERS_INST_PROPAGATOR_H
-#define __CVC4__QUANTIFIERS_INST_PROPAGATOR_H
+#ifndef CVC4__QUANTIFIERS_INST_PROPAGATOR_H
+#define CVC4__QUANTIFIERS_INST_PROPAGATOR_H
 
 #include <iostream>
 #include <map>

diff --git a/src/theory/quantifiers/inst_strategy_enumerative.h b/src/theory/quantifiers/inst_strategy_enumerative.h
index f011efdfca9e211d615ed7f9e06a4a71eab0b737..920e643bca530afe618b966c797a59fd9d53b7db 100644 (file)
--- a/src/theory/quantifiers/inst_strategy_enumerative.h
+++ b/src/theory/quantifiers/inst_strategy_enumerative.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__INST_STRATEGY_ENUMERATIVE_H
-#define __CVC4__INST_STRATEGY_ENUMERATIVE_H
+#ifndef CVC4__INST_STRATEGY_ENUMERATIVE_H
+#define CVC4__INST_STRATEGY_ENUMERATIVE_H
 
 #include "context/context.h"
 #include "context/context_mm.h"

diff --git a/src/theory/quantifiers/instantiate.h b/src/theory/quantifiers/instantiate.h
index 25f333fbbbf73b7cf524593730f3af6eae0b7f8b..2fdb494e97c533b06d239326a491c3cc3fed7eba 100644 (file)
--- a/src/theory/quantifiers/instantiate.h
+++ b/src/theory/quantifiers/instantiate.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H
-#define __CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H
+#define CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H
 
 #include <map>
 
@@ -374,4 +374,4 @@ class Instantiate : public QuantifiersUtil
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H */

diff --git a/src/theory/quantifiers/lazy_trie.h b/src/theory/quantifiers/lazy_trie.h
index ce6d841ccd1ed618f4efb09d84b61c0bc4c51e19..8f822fcc0a44233ccf563943078dfbb8d16a4996 100644 (file)
--- a/src/theory/quantifiers/lazy_trie.h
+++ b/src/theory/quantifiers/lazy_trie.h
@@ -12,8 +12,8 @@
  ** \brief lazy trie
  **/
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H
-#define __CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H
+#define CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H
 
 #include "expr/node.h"
 
@@ -170,4 +170,4 @@ class LazyTrieMulti
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H */

diff --git a/src/theory/quantifiers/local_theory_ext.h b/src/theory/quantifiers/local_theory_ext.h
index 7a61823947470e337d275e96b002bd612fd77f77..9793ea0a7acb9cea5920f72f95ccc7269b2f9119 100644 (file)
--- a/src/theory/quantifiers/local_theory_ext.h
+++ b/src/theory/quantifiers/local_theory_ext.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__LOCAL_THEORY_EXT_H
-#define __CVC4__THEORY__LOCAL_THEORY_EXT_H
+#ifndef CVC4__THEORY__LOCAL_THEORY_EXT_H
+#define CVC4__THEORY__LOCAL_THEORY_EXT_H
 
 #include "context/cdo.h"
 #include "expr/node_trie.h"

diff --git a/src/theory/quantifiers/quant_epr.h b/src/theory/quantifiers/quant_epr.h
index 9eda74d257987ea7726404fe8b1d686cee7309c2..1284dde33fb0dd73122833c4d2f227f8e6bddd01 100644 (file)
--- a/src/theory/quantifiers/quant_epr.h
+++ b/src/theory/quantifiers/quant_epr.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANT_EPR_H
-#define __CVC4__THEORY__QUANT_EPR_H
+#ifndef CVC4__THEORY__QUANT_EPR_H
+#define CVC4__THEORY__QUANT_EPR_H
 
 #include <map>
 
@@ -101,4 +101,4 @@ class QuantEPR
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANT_EPR_H */
+#endif /* CVC4__THEORY__QUANT_EPR_H */

diff --git a/src/theory/quantifiers/quant_relevance.h b/src/theory/quantifiers/quant_relevance.h
index 43bb4c548e32b7a57329523e7802db7ab577f9b2..26a4630cdfe0c465491e7191473fe55c80dca8f6 100644 (file)
--- a/src/theory/quantifiers/quant_relevance.h
+++ b/src/theory/quantifiers/quant_relevance.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANT_RELEVANCE_H
-#define __CVC4__THEORY__QUANT_RELEVANCE_H
+#ifndef CVC4__THEORY__QUANT_RELEVANCE_H
+#define CVC4__THEORY__QUANT_RELEVANCE_H
 
 #include <map>
 
@@ -68,4 +68,4 @@ class QuantRelevance : public QuantifiersUtil
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANT_RELEVANCE_H */
+#endif /* CVC4__THEORY__QUANT_RELEVANCE_H */

diff --git a/src/theory/quantifiers/quant_split.h b/src/theory/quantifiers/quant_split.h
index ec40bc52fea44ee56cf4911321c03935d2813408..1a2aaa6cfe52746f7ed0fda4b001a26997e4654c 100644 (file)
--- a/src/theory/quantifiers/quant_split.h
+++ b/src/theory/quantifiers/quant_split.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANT_SPLIT_H
-#define __CVC4__THEORY__QUANT_SPLIT_H
+#ifndef CVC4__THEORY__QUANT_SPLIT_H
+#define CVC4__THEORY__QUANT_SPLIT_H
 
 #include "theory/quantifiers_engine.h"
 #include "context/cdo.h"

diff --git a/src/theory/quantifiers/quant_util.h b/src/theory/quantifiers/quant_util.h
index ba59c18e8dad13681a502adb956681db82589b3c..43861d6e9a8ee724602fedcacf2244aa804cf889 100644 (file)
--- a/src/theory/quantifiers/quant_util.h
+++ b/src/theory/quantifiers/quant_util.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANT_UTIL_H
-#define __CVC4__THEORY__QUANT_UTIL_H
+#ifndef CVC4__THEORY__QUANT_UTIL_H
+#define CVC4__THEORY__QUANT_UTIL_H
 
 #include <iostream>
 #include <map>
@@ -237,4 +237,4 @@ public:
 }
 }
 
-#endif /* __CVC4__THEORY__QUANT_UTIL_H */
+#endif /* CVC4__THEORY__QUANT_UTIL_H */

diff --git a/src/theory/quantifiers/quantifiers_attributes.h b/src/theory/quantifiers/quantifiers_attributes.h
index 46cb5a4ce0776e347cf48eb72df63b9e98c20b25..329f9d08aa48616de63864283cb136ad6468e20b 100644 (file)
--- a/src/theory/quantifiers/quantifiers_attributes.h
+++ b/src/theory/quantifiers/quantifiers_attributes.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H
-#define __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H
+#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H
+#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H
 
 #include "expr/attribute.h"
 #include "expr/node.h"

diff --git a/src/theory/quantifiers/quantifiers_rewriter.h b/src/theory/quantifiers/quantifiers_rewriter.h
index e44672d66f382b206e5ca443edb1c810aa3a58ac..09f26b65b5bc66e62a6450c0af7a9752da93ccb4 100644 (file)
--- a/src/theory/quantifiers/quantifiers_rewriter.h
+++ b/src/theory/quantifiers/quantifiers_rewriter.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H
-#define __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H
+#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H
 
 #include "theory/rewriter.h"
 #include "theory/quantifiers_engine.h"
@@ -188,6 +188,6 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H */
 
 

diff --git a/src/theory/quantifiers/query_generator.h b/src/theory/quantifiers/query_generator.h
index b283d818b4a77155f70d196e32d813f2556841d7..749c78c85f24d2ae30996d9ddf0999a08aca94b0 100644 (file)
--- a/src/theory/quantifiers/query_generator.h
+++ b/src/theory/quantifiers/query_generator.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H
+#define CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H
 
 #include <map>
 #include <unordered_set>
@@ -113,4 +113,4 @@ class QueryGenerator : public ExprMiner
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS___H */
+#endif /* CVC4__THEORY__QUANTIFIERS___H */

diff --git a/src/theory/quantifiers/relevant_domain.h b/src/theory/quantifiers/relevant_domain.h
index ff419666f38f159b34658436155b89c9d2b407b8..8f348b4713b6c20912cfa955c7ed819caf5bc59c 100644 (file)
--- a/src/theory/quantifiers/relevant_domain.h
+++ b/src/theory/quantifiers/relevant_domain.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H
-#define __CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H
+#ifndef CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H
+#define CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H
 
 #include "theory/quantifiers/first_order_model.h"
 #include "theory/quantifiers/quant_util.h"
@@ -163,4 +163,4 @@ class RelevantDomain : public QuantifiersUtil
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H */

diff --git a/src/theory/quantifiers/rewrite_engine.h b/src/theory/quantifiers/rewrite_engine.h
index 88a9882ca929f4df0bd27da6bfba2c2a0039fc29..bbd6a1534053b2105063d499f9f1a760aab145da 100644 (file)
--- a/src/theory/quantifiers/rewrite_engine.h
+++ b/src/theory/quantifiers/rewrite_engine.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__REWRITE_ENGINE_H
-#define __CVC4__REWRITE_ENGINE_H
+#ifndef CVC4__REWRITE_ENGINE_H
+#define CVC4__REWRITE_ENGINE_H
 
 #include "context/context.h"
 #include "context/context_mm.h"

diff --git a/src/theory/quantifiers/single_inv_partition.h b/src/theory/quantifiers/single_inv_partition.h
index 1a01f3b8b627081d8f17697100bcf29ad77024c7..0a4af3185b416527aae3dd5897ed71dce0abce86 100644 (file)
--- a/src/theory/quantifiers/single_inv_partition.h
+++ b/src/theory/quantifiers/single_inv_partition.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H
-#define __CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H
+#define CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H
 
 #include <map>
 #include <vector>
@@ -294,4 +294,4 @@ class SingleInvocationPartition
 } /* namespace CVC4::theory */
 } /* namespace CVC4 */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H */

diff --git a/src/theory/quantifiers/skolemize.h b/src/theory/quantifiers/skolemize.h
index 3db3aa8384ffe88556587fb6c1c5714fbf031b96..f07bbdfd39b4300abc57467aff65050f72ac0b53 100644 (file)
--- a/src/theory/quantifiers/skolemize.h
+++ b/src/theory/quantifiers/skolemize.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H
-#define __CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H
+#define CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -143,4 +143,4 @@ class Skolemize
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H */

diff --git a/src/theory/quantifiers/solution_filter.h b/src/theory/quantifiers/solution_filter.h
index 80af05eb8576492fa35b356878bb6f72767136ed..bd4c62a0933101c31251b683f615781a0f27ed2f 100644 (file)
--- a/src/theory/quantifiers/solution_filter.h
+++ b/src/theory/quantifiers/solution_filter.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
-#define __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
+#define CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
 
 #include <map>
 #include <unordered_set>
@@ -72,4 +72,4 @@ class SolutionFilterStrength : public ExprMiner
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H */

diff --git a/src/theory/quantifiers/sygus/ce_guided_single_inv.h b/src/theory/quantifiers/sygus/ce_guided_single_inv.h
index 93b972fbcfaeda41426437183846b489da59275e..4b24cbb1cf6996cbc690d5eec998fdf69db35a2f 100644 (file)
--- a/src/theory/quantifiers/sygus/ce_guided_single_inv.h
+++ b/src/theory/quantifiers/sygus/ce_guided_single_inv.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H
-#define __CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H
+#define CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H
 
 #include "context/cdlist.h"
 #include "theory/quantifiers/sygus/ce_guided_single_inv_sol.h"

diff --git a/src/theory/quantifiers/sygus/ce_guided_single_inv_sol.h b/src/theory/quantifiers/sygus/ce_guided_single_inv_sol.h
index bdafe7bef2485f15ab80acdbb0158816cdc8083b..40117af6c2d5535c44ab39f411e4f63af84f091c 100644 (file)
--- a/src/theory/quantifiers/sygus/ce_guided_single_inv_sol.h
+++ b/src/theory/quantifiers/sygus/ce_guided_single_inv_sol.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_SOL_H
-#define __CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_SOL_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_SOL_H
+#define CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_SOL_H
 
 #include "context/cdhashmap.h"
 #include "theory/quantifiers_engine.h"

diff --git a/src/theory/quantifiers/sygus/cegis.h b/src/theory/quantifiers/sygus/cegis.h
index f706e3d97abd47254d80f52db97beeca3313c33d..a295f6a40dc9d5603eb98de3cc9cccb759ef4a98 100644 (file)
--- a/src/theory/quantifiers/sygus/cegis.h
+++ b/src/theory/quantifiers/sygus/cegis.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__CEGIS_H
-#define __CVC4__THEORY__QUANTIFIERS__CEGIS_H
+#ifndef CVC4__THEORY__QUANTIFIERS__CEGIS_H
+#define CVC4__THEORY__QUANTIFIERS__CEGIS_H
 
 #include <map>
 #include "theory/quantifiers/sygus/sygus_module.h"
@@ -209,4 +209,4 @@ class Cegis : public SygusModule
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__CEGIS_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__CEGIS_H */

diff --git a/src/theory/quantifiers/sygus/cegis_unif.h b/src/theory/quantifiers/sygus/cegis_unif.h
index 4255966c6a8741d202804954645e6be53661e19a..a2e7be1c1778c71231cecae56566e306eb10d642 100644 (file)
--- a/src/theory/quantifiers/sygus/cegis_unif.h
+++ b/src/theory/quantifiers/sygus/cegis_unif.h
@@ -13,8 +13,8 @@
  **/
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H
 
 #include <map>
 #include <vector>

diff --git a/src/theory/quantifiers/sygus/enum_stream_substitution.h b/src/theory/quantifiers/sygus/enum_stream_substitution.h
index 4d4c85703defb26d91e26e570bda57531f201be1..687641e6064f4aa1eb57b701493e7448d6f1c3e2 100644 (file)
--- a/src/theory/quantifiers/sygus/enum_stream_substitution.h
+++ b/src/theory/quantifiers/sygus/enum_stream_substitution.h
@@ -14,8 +14,8 @@
  **/
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H
 
 #include "expr/node.h"
 #include "theory/quantifiers/sygus/synth_conjecture.h"

diff --git a/src/theory/quantifiers/sygus/sygus_enumerator.h b/src/theory/quantifiers/sygus/sygus_enumerator.h
index 5bfe60f49bf30261c60c7086377d9ac948ad19bd..d4c466b034d2f1c77f2ce44c3ffc51dee8758d99 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_enumerator.h
+++ b/src/theory/quantifiers/sygus/sygus_enumerator.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H
 
 #include <map>
 #include <unordered_set>
@@ -454,4 +454,4 @@ class SygusEnumerator : public EnumValGenerator
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H */

diff --git a/src/theory/quantifiers/sygus/sygus_eval_unfold.h b/src/theory/quantifiers/sygus/sygus_eval_unfold.h
index ad1e3331d6e1d0763122b533e7ec17f56139adee..adc54c6a7ddf2b4859f2c3f7a7be258dca0a065a 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_eval_unfold.h
+++ b/src/theory/quantifiers/sygus/sygus_eval_unfold.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H
 
 #include <map>
 #include "expr/node.h"
@@ -113,4 +113,4 @@ class SygusEvalUnfold
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H */

diff --git a/src/theory/quantifiers/sygus/sygus_explain.h b/src/theory/quantifiers/sygus/sygus_explain.h
index 522d6ee8a1fef2397606ed4567d6cef24f15ccd1..ec29ab2a15635413366eaaf368e3e509da29ab93 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_explain.h
+++ b/src/theory/quantifiers/sygus/sygus_explain.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H
 
 #include <vector>
 
@@ -241,4 +241,4 @@ class SygusExplain
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H */

diff --git a/src/theory/quantifiers/sygus/sygus_grammar_cons.h b/src/theory/quantifiers/sygus/sygus_grammar_cons.h
index e3994386609ffbd8711fcc3ac0e510e6840a1bdd..7dfa9b4787c82697043bac324a9ce404d22bc57c 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_grammar_cons.h
+++ b/src/theory/quantifiers/sygus/sygus_grammar_cons.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H
 
 #include "theory/quantifiers_engine.h"
 

diff --git a/src/theory/quantifiers/sygus/sygus_grammar_norm.h b/src/theory/quantifiers/sygus/sygus_grammar_norm.h
index e186fb02c99daab6064e8d9e19df02a5fa4665a5..ae701113ce62dde70d853e50b99f177dbb19f152 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_grammar_norm.h
+++ b/src/theory/quantifiers/sygus/sygus_grammar_norm.h
@@ -14,8 +14,8 @@
  **/
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H
 
 #include <map>
 #include <memory>

diff --git a/src/theory/quantifiers/sygus/sygus_grammar_red.h b/src/theory/quantifiers/sygus/sygus_grammar_red.h
index eb43b5c3cda04099d02f155d632169d2ce5d3690..8ed080a300efa6c1b204ee33c481ac968a615196 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_grammar_red.h
+++ b/src/theory/quantifiers/sygus/sygus_grammar_red.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H
 
 #include <map>
 #include "theory/quantifiers_engine.h"
@@ -116,4 +116,4 @@ class SygusRedundantCons
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H */

diff --git a/src/theory/quantifiers/sygus/sygus_invariance.h b/src/theory/quantifiers/sygus/sygus_invariance.h
index a5b32cb0d75692b0a1585f15ddb61f3b2104d695..feb2d33135fd1b4326f3eff551a40a40dd0563ff 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_invariance.h
+++ b/src/theory/quantifiers/sygus/sygus_invariance.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H
 
 #include <unordered_map>
 #include <vector>
@@ -300,4 +300,4 @@ class NegContainsSygusInvarianceTest : public SygusInvarianceTest
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H */

diff --git a/src/theory/quantifiers/sygus/sygus_module.h b/src/theory/quantifiers/sygus/sygus_module.h
index 07bce1791200df7940bfd5c7257c1ca9771df5e6..d5e1de3fc562642d8eacad7dbe87f1a3648be2e2 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_module.h
+++ b/src/theory/quantifiers/sygus/sygus_module.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H
 
 #include <map>
 #include "expr/node.h"
@@ -148,4 +148,4 @@ class SygusModule
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H */

diff --git a/src/theory/quantifiers/sygus/sygus_pbe.h b/src/theory/quantifiers/sygus/sygus_pbe.h
index 3738c40b7708d18152685fe64df29f45a7b7f506..e82ce01da3810103385b26e3c5fdf529b2832c07 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_pbe.h
+++ b/src/theory/quantifiers/sygus/sygus_pbe.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H
 
 #include "context/cdhashmap.h"
 #include "theory/quantifiers/sygus/sygus_module.h"

diff --git a/src/theory/quantifiers/sygus/sygus_process_conj.h b/src/theory/quantifiers/sygus/sygus_process_conj.h
index 86e066b6b99668727792ec99a83b18b840c1bd16..e9ee340f49b931e98fb5590ef1345c340b77b98f 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_process_conj.h
+++ b/src/theory/quantifiers/sygus/sygus_process_conj.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H
 
 #include <map>
 #include <unordered_map>

diff --git a/src/theory/quantifiers/sygus/sygus_repair_const.h b/src/theory/quantifiers/sygus/sygus_repair_const.h
index ee23d97325c81b8824889157bdc58d09f4260d36..bc3a58f9e9b1f4c7d0f0ea5640d2e2d9c8265ccb 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_repair_const.h
+++ b/src/theory/quantifiers/sygus/sygus_repair_const.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H
 
 #include <unordered_set>
 #include "expr/node.h"
@@ -215,4 +215,4 @@ class SygusRepairConst
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */

diff --git a/src/theory/quantifiers/sygus/sygus_unif.h b/src/theory/quantifiers/sygus/sygus_unif.h
index f7a218ec0081d3af11a03b0235ebd029b8d9313d..a5215628cd64186e68621585bda2b0f5bcc9894f 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_unif.h
+++ b/src/theory/quantifiers/sygus/sygus_unif.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H
 
 #include <map>
 #include "expr/node.h"
@@ -196,4 +196,4 @@ class SygusUnif
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */

diff --git a/src/theory/quantifiers/sygus/sygus_unif_io.h b/src/theory/quantifiers/sygus/sygus_unif_io.h
index fced298719184169edfdb12e562338c58d7c3db4..7e9c5abd28a25401aee50c16c8f3b4c15bdb51bc 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_unif_io.h
+++ b/src/theory/quantifiers/sygus/sygus_unif_io.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H
 
 #include <map>
 #include "theory/quantifiers/sygus/sygus_unif.h"
@@ -489,4 +489,4 @@ class SygusUnifIo : public SygusUnif
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H */

diff --git a/src/theory/quantifiers/sygus/sygus_unif_rl.h b/src/theory/quantifiers/sygus/sygus_unif_rl.h
index 0f0b2c5330d183df654b2410bbf307d3cadd288e..ada99dbaf4ebf9b29d08903fb315719933492671 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_unif_rl.h
+++ b/src/theory/quantifiers/sygus/sygus_unif_rl.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H
 
 #include <map>
 #include "options/main_options.h"
@@ -434,4 +434,4 @@ class SygusUnifRl : public SygusUnif
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H */

diff --git a/src/theory/quantifiers/sygus/sygus_unif_strat.h b/src/theory/quantifiers/sygus/sygus_unif_strat.h
index 54933a2af374ce55fb5ac2f24ac53fce3c057ebf..1c691bd84ccf6fd34c896999da8f171967328255 100644 (file)
--- a/src/theory/quantifiers/sygus/sygus_unif_strat.h
+++ b/src/theory/quantifiers/sygus/sygus_unif_strat.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H
 
 #include <map>
 #include "expr/node.h"
@@ -429,4 +429,4 @@ class SygusUnifStrategy
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */

diff --git a/src/theory/quantifiers/sygus/synth_conjecture.h b/src/theory/quantifiers/sygus/synth_conjecture.h
index 923d1d57c2c45921281bb2963b21ca46261852a5..83a7eaa45ba3020fbf55d38937294eedb2b88754 100644 (file)
--- a/src/theory/quantifiers/sygus/synth_conjecture.h
+++ b/src/theory/quantifiers/sygus/synth_conjecture.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H
-#define __CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H
+#define CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H
 
 #include <memory>
 

diff --git a/src/theory/quantifiers/sygus/synth_engine.h b/src/theory/quantifiers/sygus/synth_engine.h
index 2dbd208272b5f427efe1b3896241b87dddd088db..d5337e5d15ef34e3e4dca1dc6ad732b4174ab89d 100644 (file)
--- a/src/theory/quantifiers/sygus/synth_engine.h
+++ b/src/theory/quantifiers/sygus/synth_engine.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H
-#define __CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H
+#define CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H
 
 #include "context/cdhashmap.h"
 #include "theory/quantifiers/sygus/synth_conjecture.h"

diff --git a/src/theory/quantifiers/sygus/term_database_sygus.h b/src/theory/quantifiers/sygus/term_database_sygus.h
index cdeaf1803cf38d72ac54d0bc71bd2d52e0841ebd..0f3d650d38a6cfb822f5e86ca94cc2d9af5fa14b 100644 (file)
--- a/src/theory/quantifiers/sygus/term_database_sygus.h
+++ b/src/theory/quantifiers/sygus/term_database_sygus.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H
-#define __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H
+#ifndef CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H
+#define CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H
 
 #include <unordered_set>
 
@@ -599,4 +599,4 @@ class TermDbSygus {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */

diff --git a/src/theory/quantifiers/sygus_sampler.h b/src/theory/quantifiers/sygus_sampler.h
index 3a2c42b9de35e1a089a3bd73e17b6a94fe5f7bca..429b6f511ad1abf6685789c7cad996dfa1734af7 100644 (file)
--- a/src/theory/quantifiers/sygus_sampler.h
+++ b/src/theory/quantifiers/sygus_sampler.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H
-#define __CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H
+#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H
+#define CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H
 
 #include <map>
 #include "theory/evaluator.h"
@@ -322,4 +322,4 @@ class SygusSampler : public LazyTrieEvaluator
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H */

diff --git a/src/theory/quantifiers/term_canonize.h b/src/theory/quantifiers/term_canonize.h
index b433992c837c763a4c725d17732fcef9e63929b8..8f7b8722e3673facf041f46ce45b60b6ad259abe 100644 (file)
--- a/src/theory/quantifiers/term_canonize.h
+++ b/src/theory/quantifiers/term_canonize.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H
-#define __CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H
+#define CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H
 
 #include <map>
 #include "expr/node.h"
@@ -89,4 +89,4 @@ class TermCanonize
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H */

diff --git a/src/theory/quantifiers/term_database.h b/src/theory/quantifiers/term_database.h
index fcbd65729693d1bcaece7d3cc31815305cdb1a39..148a18958bb1943d63d0331155269effbe30f551 100644 (file)
--- a/src/theory/quantifiers/term_database.h
+++ b/src/theory/quantifiers/term_database.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H
-#define __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H
+#ifndef CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H
+#define CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H
 
 #include <map>
 #include <unordered_set>
@@ -409,4 +409,4 @@ class TermDb : public QuantifiersUtil {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */

diff --git a/src/theory/quantifiers/term_enumeration.h b/src/theory/quantifiers/term_enumeration.h
index ed6529ef1bf19a4b5e9e68c90b6ea2fb277ee258..279680b1fd0667123915122fb4de74cb2f2d6241 100644 (file)
--- a/src/theory/quantifiers/term_enumeration.h
+++ b/src/theory/quantifiers/term_enumeration.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H
-#define __CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H
+#ifndef CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H
+#define CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H
 
 #include <unordered_map>
 #include <vector>
@@ -82,4 +82,4 @@ class TermEnumeration
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H */

diff --git a/src/theory/quantifiers/term_util.h b/src/theory/quantifiers/term_util.h
index 061da81dfab1c944423ebdf4fa815a4b60d74824..1f2eea1c5885b77d4e8224dd42f6e539836a9c63 100644 (file)
--- a/src/theory/quantifiers/term_util.h
+++ b/src/theory/quantifiers/term_util.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H
-#define __CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H
+#ifndef CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H
+#define CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H
 
 #include <map>
 #include <unordered_set>
@@ -379,4 +379,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H */

diff --git a/src/theory/quantifiers/theory_quantifiers.h b/src/theory/quantifiers/theory_quantifiers.h
index f6e19f7005bc8c6bd009ca7833c199d560aa7d2e..b5b07f2e6d3e22f7c9837678c6043d39809c7238 100644 (file)
--- a/src/theory/quantifiers/theory_quantifiers.h
+++ b/src/theory/quantifiers/theory_quantifiers.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H
-#define __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H
+#ifndef CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H
+#define CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H
 
 #include "context/cdhashmap.h"
 #include "context/context.h"
@@ -62,4 +62,4 @@ class TheoryQuantifiers : public Theory {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H */

diff --git a/src/theory/quantifiers/theory_quantifiers_type_rules.h b/src/theory/quantifiers/theory_quantifiers_type_rules.h
index 18aa7f6ee7521b9a2faf562621f9d9350781426d..ad1c4c69b7f05369378a12e2d9256a372d1c2245 100644 (file)
--- a/src/theory/quantifiers/theory_quantifiers_type_rules.h
+++ b/src/theory/quantifiers/theory_quantifiers_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H
-#define __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H
+#ifndef CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H
+#define CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H
 
 #include "expr/matcher.h"
 
@@ -229,4 +229,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H */
+#endif /* CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H */

diff --git a/src/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h
index 37d2deb405251ebcd16b5130df0e89e678188e9c..61e9053f56fd41eb71746ba401816efc85de29da 100644 (file)
--- a/src/theory/quantifiers_engine.h
+++ b/src/theory/quantifiers_engine.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__QUANTIFIERS_ENGINE_H
-#define __CVC4__THEORY__QUANTIFIERS_ENGINE_H
+#ifndef CVC4__THEORY__QUANTIFIERS_ENGINE_H
+#define CVC4__THEORY__QUANTIFIERS_ENGINE_H
 
 #include <iostream>
 #include <map>
@@ -431,4 +431,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__QUANTIFIERS_ENGINE_H */
+#endif /* CVC4__THEORY__QUANTIFIERS_ENGINE_H */

diff --git a/src/theory/rep_set.h b/src/theory/rep_set.h
index 6e990051abeea50a653f09f5bcff8759ecb935ed..d972a7a840a0380153006731aad7c46660d25e1c 100644 (file)
--- a/src/theory/rep_set.h
+++ b/src/theory/rep_set.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__REP_SET_H
-#define __CVC4__THEORY__REP_SET_H
+#ifndef CVC4__THEORY__REP_SET_H
+#define CVC4__THEORY__REP_SET_H
 
 #include <map>
 #include <vector>
@@ -313,4 +313,4 @@ class RepBoundExt
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__REP_SET_H */
+#endif /* CVC4__THEORY__REP_SET_H */

diff --git a/src/theory/sep/theory_sep.h b/src/theory/sep/theory_sep.h
index 8d5d3442a29991edfd9aa19f37b3ef9624547a93..ae044f6d7b9413c3a33d7cbd6a577ccd473edfe3 100644 (file)
--- a/src/theory/sep/theory_sep.h
+++ b/src/theory/sep/theory_sep.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SEP__THEORY_SEP_H
-#define __CVC4__THEORY__SEP__THEORY_SEP_H
+#ifndef CVC4__THEORY__SEP__THEORY_SEP_H
+#define CVC4__THEORY__SEP__THEORY_SEP_H
 
 #include "context/cdhashmap.h"
 #include "context/cdhashset.h"
@@ -331,4 +331,4 @@ class TheorySep : public Theory {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SEP__THEORY_SEP_H */
+#endif /* CVC4__THEORY__SEP__THEORY_SEP_H */

diff --git a/src/theory/sep/theory_sep_rewriter.h b/src/theory/sep/theory_sep_rewriter.h
index 6112632d8cafd94841d68a0365f11d8dde80cb79..f4639efa388c9719dd3c6822ddadba6bba89232f 100644 (file)
--- a/src/theory/sep/theory_sep_rewriter.h
+++ b/src/theory/sep/theory_sep_rewriter.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H
-#define __CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H
+#ifndef CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H
+#define CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H
 
 #include "theory/rewriter.h"
 #include "theory/type_enumerator.h"
@@ -49,4 +49,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H */
+#endif /* CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H */

diff --git a/src/theory/sep/theory_sep_type_rules.h b/src/theory/sep/theory_sep_type_rules.h
index 52a72e5dc452045c8220ce7d40d7940f01519c0a..29adeda5ae074a50a2980148033f56791732b56f 100644 (file)
--- a/src/theory/sep/theory_sep_type_rules.h
+++ b/src/theory/sep/theory_sep_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H
-#define __CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H
+#ifndef CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H
+#define CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H
 
 namespace CVC4 {
 namespace theory {
@@ -112,4 +112,4 @@ struct SepNilTypeRule {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H */
+#endif /* CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H */

diff --git a/src/theory/sets/normal_form.h b/src/theory/sets/normal_form.h
index 9c5e4e9c86a3fdfba35e588228c4a89448ff93d8..d7c68a5749717b94881f02ef13ca56b58ce520a9 100644 (file)
--- a/src/theory/sets/normal_form.h
+++ b/src/theory/sets/normal_form.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SETS__NORMAL_FORM_H
-#define __CVC4__THEORY__SETS__NORMAL_FORM_H
+#ifndef CVC4__THEORY__SETS__NORMAL_FORM_H
+#define CVC4__THEORY__SETS__NORMAL_FORM_H
 
 namespace CVC4 {
 namespace theory {

diff --git a/src/theory/sets/theory_sets.h b/src/theory/sets/theory_sets.h
index 3caa4ae16d620019f831507a07aae512ad0186a2..414ba4b287a8c501be7ff67c6d1a53c1e42cd8a2 100644 (file)
--- a/src/theory/sets/theory_sets.h
+++ b/src/theory/sets/theory_sets.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SETS__THEORY_SETS_H
-#define __CVC4__THEORY__SETS__THEORY_SETS_H
+#ifndef CVC4__THEORY__SETS__THEORY_SETS_H
+#define CVC4__THEORY__SETS__THEORY_SETS_H
 
 #include <memory>
 
@@ -71,4 +71,4 @@ class TheorySets : public Theory
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SETS__THEORY_SETS_H */
+#endif /* CVC4__THEORY__SETS__THEORY_SETS_H */

diff --git a/src/theory/sets/theory_sets_private.h b/src/theory/sets/theory_sets_private.h
index 5cda782716ca78fa9237faf99994fbb2f85641d7..3014b2f2aefdd9a84c4289b536495c41784caaa5 100644 (file)
--- a/src/theory/sets/theory_sets_private.h
+++ b/src/theory/sets/theory_sets_private.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H
-#define __CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H
+#ifndef CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H
+#define CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H
 
 #include "context/cdhashset.h"
 #include "context/cdqueue.h"
@@ -334,4 +334,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H */
+#endif /* CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H */

diff --git a/src/theory/sets/theory_sets_rewriter.h b/src/theory/sets/theory_sets_rewriter.h
index af071dc600dba376cde3b32a0dee0bfab1688420..463d02d6dbda668a1935b442a8d220e21d47e8a9 100644 (file)
--- a/src/theory/sets/theory_sets_rewriter.h
+++ b/src/theory/sets/theory_sets_rewriter.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H
-#define __CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H
+#ifndef CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H
+#define CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H
 
 #include "theory/rewriter.h"
 
@@ -89,4 +89,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H */
+#endif /* CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H */

diff --git a/src/theory/sets/theory_sets_type_enumerator.h b/src/theory/sets/theory_sets_type_enumerator.h
index cb6532abfda164923bd114320dba9053e0c31539..5a67453677655d7267cb2a3052b354596b70f6fe 100644 (file)
--- a/src/theory/sets/theory_sets_type_enumerator.h
+++ b/src/theory/sets/theory_sets_type_enumerator.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SETS__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__SETS__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__SETS__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__SETS__TYPE_ENUMERATOR_H
 
 #include "theory/type_enumerator.h"
 #include "expr/type_node.h"
@@ -183,4 +183,4 @@ class SetEnumerator : public TypeEnumeratorBase<SetEnumerator> {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SETS__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__SETS__TYPE_ENUMERATOR_H */

diff --git a/src/theory/sets/theory_sets_type_rules.h b/src/theory/sets/theory_sets_type_rules.h
index 1ba30f1e66cde01690c7455aba30387ec8c6285a..7e60384233edf90656768bcb3d76894e42759332 100644 (file)
--- a/src/theory/sets/theory_sets_type_rules.h
+++ b/src/theory/sets/theory_sets_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H
-#define __CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H
+#ifndef CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H
+#define CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H
 
 #include "theory/sets/normal_form.h"
 
@@ -428,4 +428,4 @@ struct SetsProperties {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H */
+#endif /* CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H */

diff --git a/src/theory/sort_inference.h b/src/theory/sort_inference.h
index 98c85ebe708629fde121ed971d73cc6ee5fb5814..5b28f669dd9dbbe357865809cc95d3398b1b1c25 100644 (file)
--- a/src/theory/sort_inference.h
+++ b/src/theory/sort_inference.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SORT_INFERENCE_H
-#define __CVC4__SORT_INFERENCE_H
+#ifndef CVC4__SORT_INFERENCE_H
+#define CVC4__SORT_INFERENCE_H
 
 #include <iostream>
 #include <string>

diff --git a/src/theory/strings/normal_form.h b/src/theory/strings/normal_form.h
index 73036e68fd32c1cd98d73a520d6f22b4e347ee24..3d13265709a53ae272bddd1ff864d1bfb30bb1ff 100644 (file)
--- a/src/theory/strings/normal_form.h
+++ b/src/theory/strings/normal_form.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__NORMAL_FORM_H
-#define __CVC4__THEORY__STRINGS__NORMAL_FORM_H
+#ifndef CVC4__THEORY__STRINGS__NORMAL_FORM_H
+#define CVC4__THEORY__STRINGS__NORMAL_FORM_H
 
 #include <map>
 #include <vector>
@@ -156,4 +156,4 @@ class NormalForm
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__STRINGS__NORMAL_FORM_H */
+#endif /* CVC4__THEORY__STRINGS__NORMAL_FORM_H */

diff --git a/src/theory/strings/regexp_elim.h b/src/theory/strings/regexp_elim.h
index 6d2f28eaac5e8bac415f77ebb0b2aae711fd6a6f..dbd4102b663b18c211ebc1b64032b20227d650df 100644 (file)
--- a/src/theory/strings/regexp_elim.h
+++ b/src/theory/strings/regexp_elim.h
@@ -14,8 +14,8 @@
  **/
 
 #include "cvc4_private.h"
-#ifndef __CVC4__THEORY__STRINGS__REGEXP_ELIM_H
-#define __CVC4__THEORY__STRINGS__REGEXP_ELIM_H
+#ifndef CVC4__THEORY__STRINGS__REGEXP_ELIM_H
+#define CVC4__THEORY__STRINGS__REGEXP_ELIM_H
 
 #include "expr/node.h"
 
@@ -63,4 +63,4 @@ class RegExpElimination
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__STRINGS__REGEXP_ELIM_H */
+#endif /* CVC4__THEORY__STRINGS__REGEXP_ELIM_H */

diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h
index 4a7b7b293efa89a448e98882e747ad98c9686e8a..b2e3667fc40b753c191c2489f4a044ac390c3c4a 100644 (file)
--- a/src/theory/strings/regexp_operation.h
+++ b/src/theory/strings/regexp_operation.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H
-#define __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H
+#ifndef CVC4__THEORY__STRINGS__REGEXP__OPERATION_H
+#define CVC4__THEORY__STRINGS__REGEXP__OPERATION_H
 
 #include <vector>
 #include <set>
@@ -100,4 +100,4 @@ class RegExpOpr {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H */
+#endif /* CVC4__THEORY__STRINGS__REGEXP__OPERATION_H */

diff --git a/src/theory/strings/regexp_solver.h b/src/theory/strings/regexp_solver.h
index 8b78e6ebcd72bc8601e8e7adb2703451cc5a1c25..13b66557a8598f20a2fe7fb6ba8e359c5fe2e6d4 100644 (file)
--- a/src/theory/strings/regexp_solver.h
+++ b/src/theory/strings/regexp_solver.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__REGEXP_SOLVER_H
-#define __CVC4__THEORY__STRINGS__REGEXP_SOLVER_H
+#ifndef CVC4__THEORY__STRINGS__REGEXP_SOLVER_H
+#define CVC4__THEORY__STRINGS__REGEXP_SOLVER_H
 
 #include <map>
 #include "context/cdhashset.h"
@@ -103,4 +103,4 @@ class RegExpSolver
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_H */
+#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */

diff --git a/src/theory/strings/skolem_cache.h b/src/theory/strings/skolem_cache.h
index fd40e2521331104d16e505fcb01f0484f8caaea5..c1e3c721440225d0a3bd09e4915ff7c372bff2bf 100644 (file)
--- a/src/theory/strings/skolem_cache.h
+++ b/src/theory/strings/skolem_cache.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H
-#define __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H
+#ifndef CVC4__THEORY__STRINGS__SKOLEM_CACHE_H
+#define CVC4__THEORY__STRINGS__SKOLEM_CACHE_H
 
 #include <map>
 #include <tuple>
@@ -168,4 +168,4 @@ class SkolemCache
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */
+#endif /* CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */

diff --git a/src/theory/strings/theory_strings.h b/src/theory/strings/theory_strings.h
index e9d82a7b26cae611fde08bda1ec144472ae1866e..8371a27eaf6483d6ea6dc6f22e88ef994a40185c 100644 (file)
--- a/src/theory/strings/theory_strings.h
+++ b/src/theory/strings/theory_strings.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_H
-#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_H
+#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_H
+#define CVC4__THEORY__STRINGS__THEORY_STRINGS_H
 
 #include "context/cdhashset.h"
 #include "context/cdlist.h"
@@ -1166,4 +1166,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_H */
+#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */

diff --git a/src/theory/strings/theory_strings_preprocess.h b/src/theory/strings/theory_strings_preprocess.h
index daa1096821e5139d3568267654f8655191f1092f..b96d619efd2b60ab27f1dd1ac2587deacec3b5b5 100644 (file)
--- a/src/theory/strings/theory_strings_preprocess.h
+++ b/src/theory/strings/theory_strings_preprocess.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__PREPROCESS_H
-#define __CVC4__THEORY__STRINGS__PREPROCESS_H
+#ifndef CVC4__THEORY__STRINGS__PREPROCESS_H
+#define CVC4__THEORY__STRINGS__PREPROCESS_H
 
 #include <vector>
 #include "context/cdhashmap.h"
@@ -86,4 +86,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__STRINGS__PREPROCESS_H */
+#endif /* CVC4__THEORY__STRINGS__PREPROCESS_H */

diff --git a/src/theory/strings/theory_strings_rewriter.h b/src/theory/strings/theory_strings_rewriter.h
index 61031ea87cf255b72652beefaaeadcf649946342..e8886d43b02678fdee99639e018260d98a7c1fa2 100644 (file)
--- a/src/theory/strings/theory_strings_rewriter.h
+++ b/src/theory/strings/theory_strings_rewriter.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H
-#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H
+#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H
+#define CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H
 
 #include <utility>
 #include <vector>
@@ -751,4 +751,4 @@ class TheoryStringsRewriter {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H */
+#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H */

diff --git a/src/theory/strings/theory_strings_type_rules.h b/src/theory/strings/theory_strings_type_rules.h
index 3ad28ee0f41ddce59104b75297c36248d5b7c1f6..91de8ac01dcce3f9d4b4cc3bb902533a18d688af 100644 (file)
--- a/src/theory/strings/theory_strings_type_rules.h
+++ b/src/theory/strings/theory_strings_type_rules.h
@@ -17,8 +17,8 @@
 #include "cvc4_private.h"
 #include "options/strings_options.h"
 
-#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H
-#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H
+#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H
+#define CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H
 
 namespace CVC4 {
 namespace theory {
@@ -490,4 +490,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */
+#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */

diff --git a/src/theory/strings/type_enumerator.h b/src/theory/strings/type_enumerator.h
index 7327042e2cc74b9d51388be6c8a654873c318ee1..5ca0b624ded32dc4d3528fc50c1eef3e58290b5b 100644 (file)
--- a/src/theory/strings/type_enumerator.h
+++ b/src/theory/strings/type_enumerator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H
 
 #include <sstream>
 
@@ -128,4 +128,4 @@ class StringEnumeratorLength {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */

diff --git a/src/theory/subs_minimize.h b/src/theory/subs_minimize.h
index 3f351de7ed6af01a1bf3e0ba4036ae39388bf8ef..3ffd588f165d2ab6ed6f2b80dc1039d386b00bf5 100644 (file)
--- a/src/theory/subs_minimize.h
+++ b/src/theory/subs_minimize.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SUBS_MINIMIZE_H
-#define __CVC4__THEORY__SUBS_MINIMIZE_H
+#ifndef CVC4__THEORY__SUBS_MINIMIZE_H
+#define CVC4__THEORY__SUBS_MINIMIZE_H
 
 #include <vector>
 
@@ -97,4 +97,4 @@ class SubstitutionMinimize
 }  // namespace theory
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__SUBS_MINIMIZE_H */
+#endif /* CVC4__THEORY__SUBS_MINIMIZE_H */

diff --git a/src/theory/substitutions.h b/src/theory/substitutions.h
index 31e98de3b8db43bd9084b23f2d0fccc3362e20aa..c19fb12f67686b8937eba4fc7461ef6d6c056fd9 100644 (file)
--- a/src/theory/substitutions.h
+++ b/src/theory/substitutions.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__SUBSTITUTIONS_H
-#define __CVC4__THEORY__SUBSTITUTIONS_H
+#ifndef CVC4__THEORY__SUBSTITUTIONS_H
+#define CVC4__THEORY__SUBSTITUTIONS_H
 
 //#include <algorithm>
 #include <utility>
@@ -199,4 +199,4 @@ std::ostream& operator<<(std::ostream& out, const theory::SubstitutionMap::itera
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__SUBSTITUTIONS_H */
+#endif /* CVC4__THEORY__SUBSTITUTIONS_H */

diff --git a/src/theory/theory.h b/src/theory/theory.h
index 02a0c9cafeb78b3e1493ec6f6bbba8418908ed8e..cabb17f48379ae2f0ea2d142885e63f2c4c7ebd1 100644 (file)
--- a/src/theory/theory.h
+++ b/src/theory/theory.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__THEORY_H
-#define __CVC4__THEORY__THEORY_H
+#ifndef CVC4__THEORY__THEORY_H
+#define CVC4__THEORY__THEORY_H
 
 #include <iosfwd>
 #include <map>
@@ -915,4 +915,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__THEORY_H */
+#endif /* CVC4__THEORY__THEORY_H */

diff --git a/src/theory/theory_engine.h b/src/theory/theory_engine.h
index ca761f97d1d6af247b3430b7c39c2cd8595b266f..701d5cefb0608f1786dd3108ad61aed11eceee26 100644 (file)
--- a/src/theory/theory_engine.h
+++ b/src/theory/theory_engine.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY_ENGINE_H
-#define __CVC4__THEORY_ENGINE_H
+#ifndef CVC4__THEORY_ENGINE_H
+#define CVC4__THEORY_ENGINE_H
 
 #include <deque>
 #include <memory>
@@ -932,4 +932,4 @@ private:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY_ENGINE_H */
+#endif /* CVC4__THEORY_ENGINE_H */

diff --git a/src/theory/theory_model.h b/src/theory/theory_model.h
index c2bece0b43be2e189514a2c8a601bccd8be6e0cd..baf3a401c09a0c3ebf804d2f520cd95280956b50 100644 (file)
--- a/src/theory/theory_model.h
+++ b/src/theory/theory_model.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__THEORY_MODEL_H
-#define __CVC4__THEORY__THEORY_MODEL_H
+#ifndef CVC4__THEORY__THEORY_MODEL_H
+#define CVC4__THEORY__THEORY_MODEL_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -351,4 +351,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__THEORY_MODEL_H */
+#endif /* CVC4__THEORY__THEORY_MODEL_H */

diff --git a/src/theory/theory_model_builder.h b/src/theory/theory_model_builder.h
index 91734fcf8a38a485a2ef1f17fb5a530561de536f..ce090b14d014f9443b0743d79a99e47fa1f97235 100644 (file)
--- a/src/theory/theory_model_builder.h
+++ b/src/theory/theory_model_builder.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__THEORY_MODEL_BUILDER_H
-#define __CVC4__THEORY__THEORY_MODEL_BUILDER_H
+#ifndef CVC4__THEORY__THEORY_MODEL_BUILDER_H
+#define CVC4__THEORY__THEORY_MODEL_BUILDER_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -259,4 +259,4 @@ class TheoryEngineModelBuilder : public ModelBuilder
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__THEORY_MODEL_BUILDER_H */
+#endif /* CVC4__THEORY__THEORY_MODEL_BUILDER_H */

diff --git a/src/theory/theory_registrar.h b/src/theory/theory_registrar.h
index 2e46fa4d8aad6e5214548f620965fbc066e4a790..822ae086c3bedc323f6847e99195f817947b0872 100644 (file)
--- a/src/theory/theory_registrar.h
+++ b/src/theory/theory_registrar.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__THEORY_REGISTRAR_H
-#define __CVC4__THEORY__THEORY_REGISTRAR_H
+#ifndef CVC4__THEORY__THEORY_REGISTRAR_H
+#define CVC4__THEORY__THEORY_REGISTRAR_H
 
 #include "prop/registrar.h"
 #include "theory/theory_engine.h"
@@ -44,4 +44,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__THEORY_REGISTRAR_H */
+#endif /* CVC4__THEORY__THEORY_REGISTRAR_H */

diff --git a/src/theory/theory_test_utils.h b/src/theory/theory_test_utils.h
index 889ea6eb1658c325726699c7c012e16c36bf792a..ecda12dee5e6476d9905710c71709bd1ddaad446 100644 (file)
--- a/src/theory/theory_test_utils.h
+++ b/src/theory/theory_test_utils.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__THEORY__THEORY_TEST_UTILS_H
-#define __CVC4__THEORY__THEORY_TEST_UTILS_H
+#ifndef CVC4__THEORY__THEORY_TEST_UTILS_H
+#define CVC4__THEORY__THEORY_TEST_UTILS_H
 
 #include <iostream>
 #include <memory>
@@ -124,4 +124,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__THEORY_TEST_UTILS_H */
+#endif /* CVC4__THEORY__THEORY_TEST_UTILS_H */

diff --git a/src/theory/type_enumerator.h b/src/theory/type_enumerator.h
index a68e3ca6131b354bd111a7ed0bf238d749df9dce..a92cfd2af7f74defd20b45d836ecbba811058f26 100644 (file)
--- a/src/theory/type_enumerator.h
+++ b/src/theory/type_enumerator.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__TYPE_ENUMERATOR_H
-#define __CVC4__THEORY__TYPE_ENUMERATOR_H
+#ifndef CVC4__THEORY__TYPE_ENUMERATOR_H
+#define CVC4__THEORY__TYPE_ENUMERATOR_H
 
 #include "base/exception.h"
 #include "base/cvc4_assert.h"
@@ -185,4 +185,4 @@ class TypeEnumerator {
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__TYPE_ENUMERATOR_H */
+#endif /* CVC4__THEORY__TYPE_ENUMERATOR_H */

diff --git a/src/theory/type_set.h b/src/theory/type_set.h
index cada9422d5104ebdbe6d70916504013828a40648..aed7ad80cb65ea0691ed55e31dfaf4f416f57223 100644 (file)
--- a/src/theory/type_set.h
+++ b/src/theory/type_set.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__TYPE_SET_H
-#define __CVC4__THEORY__TYPE_SET_H
+#ifndef CVC4__THEORY__TYPE_SET_H
+#define CVC4__THEORY__TYPE_SET_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -87,4 +87,4 @@ class TypeSet
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__TYPE_SET_H */
+#endif /* CVC4__THEORY__TYPE_SET_H */

diff --git a/src/theory/uf/equality_engine_types.h b/src/theory/uf/equality_engine_types.h
index 75216d10ebfaff46dcddd34bb9e35bb1fca13e7f..3813bb697c7317e38901fd8553714a386e39f8b4 100644 (file)
--- a/src/theory/uf/equality_engine_types.h
+++ b/src/theory/uf/equality_engine_types.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H
-#define __CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H
+#ifndef CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H
+#define CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H
 
 #include <string>
 #include <iostream>
@@ -360,4 +360,4 @@ struct TriggerInfo {
 } // namespace theory
 } // namespace CVC4
 
-#endif /* __CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H */
+#endif /* CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H */

diff --git a/src/theory/uf/symmetry_breaker.h b/src/theory/uf/symmetry_breaker.h
index dd79b571ac4b33413917f386c09bb663a6587eb6..d528e948f57ad5b79aedf8336960d0223166b8ac 100644 (file)
--- a/src/theory/uf/symmetry_breaker.h
+++ b/src/theory/uf/symmetry_breaker.h
@@ -41,8 +41,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__UF__SYMMETRY_BREAKER_H
-#define __CVC4__THEORY__UF__SYMMETRY_BREAKER_H
+#ifndef CVC4__THEORY__UF__SYMMETRY_BREAKER_H
+#define CVC4__THEORY__UF__SYMMETRY_BREAKER_H
 
 #include <iostream>
 #include <list>
@@ -176,4 +176,4 @@ std::ostream& operator<<(std::ostream& out, const ::CVC4::theory::uf::SymmetryBr
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__UF__SYMMETRY_BREAKER_H */
+#endif /* CVC4__THEORY__UF__SYMMETRY_BREAKER_H */

diff --git a/src/theory/uf/theory_uf.h b/src/theory/uf/theory_uf.h
index fb873e7dc272692d833d74fa835b93eb46a08337..72dc04b10aca655362bcd210bd0a59d4868c79ed 100644 (file)
--- a/src/theory/uf/theory_uf.h
+++ b/src/theory/uf/theory_uf.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__UF__THEORY_UF_H
-#define __CVC4__THEORY__UF__THEORY_UF_H
+#ifndef CVC4__THEORY__UF__THEORY_UF_H
+#define CVC4__THEORY__UF__THEORY_UF_H
 
 #include "context/cdhashset.h"
 #include "context/cdo.h"
@@ -315,4 +315,4 @@ private:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__UF__THEORY_UF_H */
+#endif /* CVC4__THEORY__UF__THEORY_UF_H */

diff --git a/src/theory/uf/theory_uf_model.h b/src/theory/uf/theory_uf_model.h
index f8c947d7a0ca85d8238b5078acda921af5057668..4454b7e8c4543606e8513158ec03e8ebe4e3752d 100644 (file)
--- a/src/theory/uf/theory_uf_model.h
+++ b/src/theory/uf/theory_uf_model.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY_UF_MODEL_H
-#define __CVC4__THEORY_UF_MODEL_H
+#ifndef CVC4__THEORY_UF_MODEL_H
+#define CVC4__THEORY_UF_MODEL_H
 
 #include "theory/theory_model.h"
 

diff --git a/src/theory/uf/theory_uf_rewriter.h b/src/theory/uf/theory_uf_rewriter.h
index d9b2cccaa4f65c872613eb3c2be4f18fbf4fd7d8..bad4189d67e05a54e79460ea527e8cf7cf53aca8 100644 (file)
--- a/src/theory/uf/theory_uf_rewriter.h
+++ b/src/theory/uf/theory_uf_rewriter.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__UF__THEORY_UF_REWRITER_H
-#define __CVC4__THEORY__UF__THEORY_UF_REWRITER_H
+#ifndef CVC4__THEORY__UF__THEORY_UF_REWRITER_H
+#define CVC4__THEORY__UF__THEORY_UF_REWRITER_H
 
 #include "expr/node_algorithm.h"
 #include "theory/rewriter.h"
@@ -213,4 +213,4 @@ public: //conversion between HO_APPLY AND APPLY_UF
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__UF__THEORY_UF_REWRITER_H */
+#endif /* CVC4__THEORY__UF__THEORY_UF_REWRITER_H */

diff --git a/src/theory/uf/theory_uf_strong_solver.h b/src/theory/uf/theory_uf_strong_solver.h
index 41577f21739c0ab4e3694161397747094b6a4b73..5dac994aae176e934fb300667f38c9f6eb7e4a5e 100644 (file)
--- a/src/theory/uf/theory_uf_strong_solver.h
+++ b/src/theory/uf/theory_uf_strong_solver.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY_UF_STRONG_SOLVER_H
-#define __CVC4__THEORY_UF_STRONG_SOLVER_H
+#ifndef CVC4__THEORY_UF_STRONG_SOLVER_H
+#define CVC4__THEORY_UF_STRONG_SOLVER_H
 
 #include "context/cdhashmap.h"
 #include "context/context.h"
@@ -476,4 +476,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY_UF_STRONG_SOLVER_H */
+#endif /* CVC4__THEORY_UF_STRONG_SOLVER_H */

diff --git a/src/theory/uf/theory_uf_type_rules.h b/src/theory/uf/theory_uf_type_rules.h
index 013eb89a069b98118772fc479371cf33f86dcdc5..cb373b5358236c745d8973804d970ca483e569cc 100644 (file)
--- a/src/theory/uf/theory_uf_type_rules.h
+++ b/src/theory/uf/theory_uf_type_rules.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H
-#define __CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H
+#ifndef CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H
+#define CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H
 
 namespace CVC4 {
 namespace theory {
@@ -178,4 +178,4 @@ class HoApplyTypeRule {
 } /* CVC4::theory namespace */
 } /* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H */
+#endif /* CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H */

diff --git a/src/theory/valuation.h b/src/theory/valuation.h
index c5abdb6ae4c30523ec30d4118a74602c957b061b..89f286a5e6909af4010175ae1886d07ef162c09e 100644 (file)
--- a/src/theory/valuation.h
+++ b/src/theory/valuation.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__VALUATION_H
-#define __CVC4__THEORY__VALUATION_H
+#ifndef CVC4__THEORY__VALUATION_H
+#define CVC4__THEORY__VALUATION_H
 
 #include "expr/node.h"
 #include "options/theoryof_mode.h"
@@ -151,4 +151,4 @@ public:
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__THEORY__VALUATION_H */
+#endif /* CVC4__THEORY__VALUATION_H */

diff --git a/src/util/bin_heap.h b/src/util/bin_heap.h
index be54dfa03ca46e275d9705577412c0d40c00ddfb..d6a7c95d75066e96e2b89a3df758a96bc52504ee 100644 (file)
--- a/src/util/bin_heap.h
+++ b/src/util/bin_heap.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__BIN_HEAP_H
-#define __CVC4__BIN_HEAP_H
+#ifndef CVC4__BIN_HEAP_H
+#define CVC4__BIN_HEAP_H
 
 #include <limits>
 #include <functional>
@@ -365,4 +365,4 @@ const size_t BinaryHeap<Elem,CmpFcn>::MAX_SIZE = (std::numeric_limits<size_t>::m
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BIN_HEAP_H */
+#endif /* CVC4__BIN_HEAP_H */

diff --git a/src/util/bitvector.h b/src/util/bitvector.h
index 8b1d58e80bb1fa716cd474c8c62d6857b782e8d3..f13db54173016cc44f509f4f9fd26c48fa95dbce 100644 (file)
--- a/src/util/bitvector.h
+++ b/src/util/bitvector.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__BITVECTOR_H
-#define __CVC4__BITVECTOR_H
+#ifndef CVC4__BITVECTOR_H
+#define CVC4__BITVECTOR_H
 
 #include <cstdint>
 #include <iosfwd>
@@ -434,4 +434,4 @@ inline std::ostream& operator<<(std::ostream& os, const IntToBitVector& bv)
 
 }  // namespace CVC4
 
-#endif /* __CVC4__BITVECTOR_H */
+#endif /* CVC4__BITVECTOR_H */

diff --git a/src/util/bool.h b/src/util/bool.h
index 1c88ad601d4def7d46a13914987df6d6cd2634dd..32f3741f8ac5f66ab04a412adb8c27c6d9fda259 100644 (file)
--- a/src/util/bool.h
+++ b/src/util/bool.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__BOOL_H
-#define __CVC4__BOOL_H
+#ifndef CVC4__BOOL_H
+#define CVC4__BOOL_H
 
 namespace CVC4 {
 
@@ -29,4 +29,4 @@ struct BoolHashFunction {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__BOOL_H */
+#endif /* CVC4__BOOL_H */

diff --git a/src/util/cardinality.h b/src/util/cardinality.h
index b3021db64b5525cad141a7cb64fd7fbfb1ca4ae0..b06d72286dd083795318067208dc3adefebe7dc4 100644 (file)
--- a/src/util/cardinality.h
+++ b/src/util/cardinality.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__CARDINALITY_H
-#define __CVC4__CARDINALITY_H
+#ifndef CVC4__CARDINALITY_H
+#define CVC4__CARDINALITY_H
 
 #include <iostream>
 #include <utility>
@@ -225,4 +225,4 @@ std::ostream& operator<<(std::ostream& out, const Cardinality& c) CVC4_PUBLIC;
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__CARDINALITY_H */
+#endif /* CVC4__CARDINALITY_H */

diff --git a/src/util/channel.h b/src/util/channel.h
index 8587800c1096773c8e9998a1edbfee3cff313181..00776921f158f0a34ab6e4725b166d9e353d87c9 100644 (file)
--- a/src/util/channel.h
+++ b/src/util/channel.h
@@ -22,8 +22,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__CHANNEL_H
-#define __CVC4__CHANNEL_H
+#ifndef CVC4__CHANNEL_H
+#define CVC4__CHANNEL_H
 
 #include <boost/circular_buffer.hpp>
 #include <boost/thread/mutex.hpp>
@@ -118,4 +118,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__CHANNEL_H */
+#endif /* CVC4__CHANNEL_H */

diff --git a/src/util/debug.h b/src/util/debug.h
index 516908d3d2d1fab4e7f8309ee906585aed43a62a..e25ca81681384b87463edd22410f14082f89f529 100644 (file)
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -20,8 +20,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__DEBUG_H
-#define __CVC4__DEBUG_H
+#ifndef CVC4__DEBUG_H
+#define CVC4__DEBUG_H
 
 #include <cassert>
 
@@ -34,4 +34,4 @@
 #  define cvc4assert(x) /*__builtin_expect( ( x ), true )*/
 #endif /* CVC4_ASSERTIONS */
 
-#endif /* __CVC4__DEBUG_H */
+#endif /* CVC4__DEBUG_H */

diff --git a/src/util/divisible.h b/src/util/divisible.h
index f545ab9d8e2985368f8ef2cd5e466a0ecf9ae992..a0c73043660fb2fbe774a8fea489f0c3a87436b7 100644 (file)
--- a/src/util/divisible.h
+++ b/src/util/divisible.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__DIVISIBLE_H
-#define __CVC4__DIVISIBLE_H
+#ifndef CVC4__DIVISIBLE_H
+#define CVC4__DIVISIBLE_H
 
 #include <iosfwd>
 
@@ -60,4 +60,4 @@ inline std::ostream& operator <<(std::ostream& os, const Divisible& d) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__DIVISIBLE_H */
+#endif /* CVC4__DIVISIBLE_H */

diff --git a/src/util/floatingpoint.h.in b/src/util/floatingpoint.h.in
index 5ba02b30f3543008592f933789908463ce415177..bac0fbd59e858e773ce4504e7d8f911fbc1eb5ee 100644 (file)
--- a/src/util/floatingpoint.h.in
+++ b/src/util/floatingpoint.h.in
@@ -17,8 +17,8 @@
  **/
 #include "cvc4_public.h"
 
-#ifndef __CVC4__FLOATINGPOINT_H
-#define __CVC4__FLOATINGPOINT_H
+#ifndef CVC4__FLOATINGPOINT_H
+#define CVC4__FLOATINGPOINT_H
 
 #include "util/bitvector.h"
 #include "util/rational.h"
@@ -551,4 +551,4 @@ namespace CVC4 {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__FLOATINGPOINT_H */
+#endif /* CVC4__FLOATINGPOINT_H */

diff --git a/src/util/gmp_util.h b/src/util/gmp_util.h
index 2bc4a392fa33a83c94be8fe7105c1629969256f8..3ba388564677495a7d7137e745703448f72449ff 100644 (file)
--- a/src/util/gmp_util.h
+++ b/src/util/gmp_util.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__GMP_UTIL_H
-#define __CVC4__GMP_UTIL_H
+#ifndef CVC4__GMP_UTIL_H
+#define CVC4__GMP_UTIL_H
 
 /*
  * Older versions of GMP in combination with newer versions of GCC and C++11
@@ -44,4 +44,4 @@ inline size_t gmpz_hash(const mpz_t toHash) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__GMP_UTIL_H */
+#endif /* CVC4__GMP_UTIL_H */

diff --git a/src/util/hash.h b/src/util/hash.h
index ef856746417a225872157bfa0738bcf83e50eff8..14167bc827621322976e19661985e1f4863a7cfb 100644 (file)
--- a/src/util/hash.h
+++ b/src/util/hash.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__HASH_H
-#define __CVC4__HASH_H
+#ifndef CVC4__HASH_H
+#define CVC4__HASH_H
 
 #include <cstdint>
 #include <functional>
@@ -67,4 +67,4 @@ struct PairHashFunction {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__HASH_H */
+#endif /* CVC4__HASH_H */

diff --git a/src/util/index.h b/src/util/index.h
index 8000c049a4af7049ffd0577dbd2a40027cae50d1..2ee6ff19ebdfe994529a88a946d89fddf171dfc9 100644 (file)
--- a/src/util/index.h
+++ b/src/util/index.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__INDEX_H
-#define __CVC4__INDEX_H
+#ifndef CVC4__INDEX_H
+#define CVC4__INDEX_H
 
 #include <cstdint>
 
@@ -28,4 +28,4 @@ using Index = uint32_t;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__INDEX_H */
+#endif /* CVC4__INDEX_H */

diff --git a/src/util/integer_cln_imp.h b/src/util/integer_cln_imp.h
index 4b030efa80d72d783e71acd6eade805ffb0ff24c..aba5b6a3a1571b9a28ac0e3fb6e7435b4fb56f65 100644 (file)
--- a/src/util/integer_cln_imp.h
+++ b/src/util/integer_cln_imp.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__INTEGER_H
-#define __CVC4__INTEGER_H
+#ifndef CVC4__INTEGER_H
+#define CVC4__INTEGER_H
 
 #include <cln/input.h>
 #include <cln/integer.h>
@@ -559,4 +559,4 @@ inline std::ostream& operator<<(std::ostream& os, const Integer& n) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__INTEGER_H */
+#endif /* CVC4__INTEGER_H */

diff --git a/src/util/integer_gmp_imp.h b/src/util/integer_gmp_imp.h
index f9cf3b6e26d8bd4386ba8570cc54138bb4148302..144e885361b5962a90483c07e910868b3365fe96 100644 (file)
--- a/src/util/integer_gmp_imp.h
+++ b/src/util/integer_gmp_imp.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__INTEGER_H
-#define __CVC4__INTEGER_H
+#ifndef CVC4__INTEGER_H
+#define CVC4__INTEGER_H
 
 #include <string>
 #include <iosfwd>
@@ -540,4 +540,4 @@ inline std::ostream& operator<<(std::ostream& os, const Integer& n) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__INTEGER_H */
+#endif /* CVC4__INTEGER_H */

diff --git a/src/util/maybe.h b/src/util/maybe.h
index c3247d30738c975b5e9a95f9d03ca7eea2b726ae..33c6c6511fef034374051ad48672b7d67e0c5a75 100644 (file)
--- a/src/util/maybe.h
+++ b/src/util/maybe.h
@@ -24,8 +24,8 @@
  **/
 #include "cvc4_public.h"
 
-#ifndef __CVC4__UTIL__MAYBE_H
-#define __CVC4__UTIL__MAYBE_H
+#ifndef CVC4__UTIL__MAYBE_H
+#define CVC4__UTIL__MAYBE_H
 
 #include <ostream>
 
@@ -86,4 +86,4 @@ inline std::ostream& operator<<(std::ostream& out, const Maybe<T>& m){
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UTIL__MAYBE_H */
+#endif /* CVC4__UTIL__MAYBE_H */

diff --git a/src/util/ostream_util.h b/src/util/ostream_util.h
index d5fd93ce903457fdfe305cd0bb88738661195db8..45d30a01c47e088018b1b6646beba4c0750a86f9 100644 (file)
--- a/src/util/ostream_util.h
+++ b/src/util/ostream_util.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UTIL__OSTREAM_UTIL_H
-#define __CVC4__UTIL__OSTREAM_UTIL_H
+#ifndef CVC4__UTIL__OSTREAM_UTIL_H
+#define CVC4__UTIL__OSTREAM_UTIL_H
 
 #include <ios>
 #include <ostream>
@@ -46,4 +46,4 @@ class StreamFormatScope
 
 }  // namespace CVC4
 
-#endif /* __CVC4__UTIL__OSTREAM_UTIL_H */
+#endif /* CVC4__UTIL__OSTREAM_UTIL_H */

diff --git a/src/util/proof.h b/src/util/proof.h
index 1440d0a91844331228030e668e9431528f24fa2e..ac129e3aacd340f866ea483093b45b83cc5977fe 100644 (file)
--- a/src/util/proof.h
+++ b/src/util/proof.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__PROOF_H
-#define __CVC4__PROOF_H
+#ifndef CVC4__PROOF_H
+#define CVC4__PROOF_H
 
 #include <iosfwd>
 #include <unordered_map>
@@ -41,4 +41,4 @@ class CVC4_PUBLIC Proof
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PROOF_H */
+#endif /* CVC4__PROOF_H */

diff --git a/src/util/random.h b/src/util/random.h
index d031a6b80e5c13c4921a2d3a46f2e96ac12b28f9..0b46a1f0486a00d6e7b4b75011fb65028a4fcc70 100644 (file)
--- a/src/util/random.h
+++ b/src/util/random.h
@@ -18,8 +18,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UTIL__RANDOM_H
-#define __CVC4__UTIL__RANDOM_H
+#ifndef CVC4__UTIL__RANDOM_H
+#define CVC4__UTIL__RANDOM_H
 
 namespace CVC4 {
 

diff --git a/src/util/rational_cln_imp.h b/src/util/rational_cln_imp.h
index 03bda2c7d84430bb33d58a2f499a2104f706a1b7..660c4b07583c69fbbd5546d8bd51b8833c0b4f64 100644 (file)
--- a/src/util/rational_cln_imp.h
+++ b/src/util/rational_cln_imp.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__RATIONAL_H
-#define __CVC4__RATIONAL_H
+#ifndef CVC4__RATIONAL_H
+#define CVC4__RATIONAL_H
 
 #include <gmp.h>
 #include <string>
@@ -373,4 +373,4 @@ CVC4_PUBLIC std::ostream& operator<<(std::ostream& os, const Rational& n);
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__RATIONAL_H */
+#endif /* CVC4__RATIONAL_H */

diff --git a/src/util/rational_gmp_imp.h b/src/util/rational_gmp_imp.h
index ab4b5c5a882d2b8c3d4c1f967ed632e9c600317e..ff8a0f776fad16b04134000022f7a0ae317cc9a0 100644 (file)
--- a/src/util/rational_gmp_imp.h
+++ b/src/util/rational_gmp_imp.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__RATIONAL_H
-#define __CVC4__RATIONAL_H
+#ifndef CVC4__RATIONAL_H
+#define CVC4__RATIONAL_H
 
 /*
  * Older versions of GMP in combination with newer versions of GCC and C++11
@@ -358,4 +358,4 @@ CVC4_PUBLIC std::ostream& operator<<(std::ostream& os, const Rational& n);
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__RATIONAL_H */
+#endif /* CVC4__RATIONAL_H */

diff --git a/src/util/regexp.h b/src/util/regexp.h
index 64b05b900adc7bd16a79a22f43e0ec368d1f35c3..f7c6fb2ae2fa15734f2970501e2277c5b4173ea3 100644 (file)
--- a/src/util/regexp.h
+++ b/src/util/regexp.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__REGEXP_H
-#define __CVC4__REGEXP_H
+#ifndef CVC4__REGEXP_H
+#define CVC4__REGEXP_H
 
 #include <cstddef>
 #include <functional>
@@ -246,4 +246,4 @@ std::ostream& operator<<(std::ostream& os, const String& s) CVC4_PUBLIC;
 
 }  // namespace CVC4
 
-#endif /* __CVC4__REGEXP_H */
+#endif /* CVC4__REGEXP_H */

diff --git a/src/util/resource_manager.h b/src/util/resource_manager.h
index 03fcfaffb6e55b702c291d7b6e6a7a30fff7e078..264565a76b421683e8470a49ebe74079e45e8745 100644 (file)
--- a/src/util/resource_manager.h
+++ b/src/util/resource_manager.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__RESOURCE_MANAGER_H
-#define __CVC4__RESOURCE_MANAGER_H
+#ifndef CVC4__RESOURCE_MANAGER_H
+#define CVC4__RESOURCE_MANAGER_H
 
 #include <cstddef>
 #include <sys/time.h>
@@ -197,4 +197,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__RESOURCE_MANAGER_H */
+#endif /* CVC4__RESOURCE_MANAGER_H */

diff --git a/src/util/result.h b/src/util/result.h
index 29fef936225df0cf4b59b1473416e43454aafbff..f34a9bb5aefea91ead2fc042c75b1fdc75e86864 100644 (file)
--- a/src/util/result.h
+++ b/src/util/result.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__RESULT_H
-#define __CVC4__RESULT_H
+#ifndef CVC4__RESULT_H
+#define CVC4__RESULT_H
 
 #include <iostream>
 #include <string>
@@ -151,4 +151,4 @@ bool operator!=(enum Result::Validity v, const Result& r) CVC4_PUBLIC;
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__RESULT_H */
+#endif /* CVC4__RESULT_H */

diff --git a/src/util/safe_print.h b/src/util/safe_print.h
index a8a096d111abd0d33e483234414a3fb5807f1c54..75a517b1829da8615042bcbebf83c52b99197e06 100644 (file)
--- a/src/util/safe_print.h
+++ b/src/util/safe_print.h
@@ -29,8 +29,8 @@
 
 #include "cvc4_private_library.h"
 
-#ifndef __CVC4__SAFE_PRINT_H
-#define __CVC4__SAFE_PRINT_H
+#ifndef CVC4__SAFE_PRINT_H
+#define CVC4__SAFE_PRINT_H
 
 #if __cplusplus >= 201103L
 // For c++11 and newer
@@ -96,4 +96,4 @@ void safe_print_right_aligned(int fd, uint64_t i, ssize_t width);
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__SAFE_PRINT_H */
+#endif /* CVC4__SAFE_PRINT_H */

diff --git a/src/util/sampler.h b/src/util/sampler.h
index 0c727d8d491919171b47f0017a99dcbe2be9e41e..aa473ba0ca2e30741999d03a26536156a8b97ade 100644 (file)
--- a/src/util/sampler.h
+++ b/src/util/sampler.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UTIL_FLOATINGPOINT_SAMPLER_H
-#define __CVC4__UTIL_FLOATINGPOINT_SAMPLER_H
+#ifndef CVC4__UTIL_FLOATINGPOINT_SAMPLER_H
+#define CVC4__UTIL_FLOATINGPOINT_SAMPLER_H
 
 #include "util/floatingpoint.h"
 #include "util/random.h"
@@ -55,4 +55,4 @@ class Sampler
 
 }  // namespace CVC4
 
-#endif /* __CVC4__UTIL_FLOATINGPOINT_SAMPLER_H */
+#endif /* CVC4__UTIL_FLOATINGPOINT_SAMPLER_H */

diff --git a/src/util/sexpr.h b/src/util/sexpr.h
index 573b4fcd417e754ef2a0fd61d06e12ac15800581..bdc85df41e58c701f2bf9d0bbd859faf4d783fe7 100644 (file)
--- a/src/util/sexpr.h
+++ b/src/util/sexpr.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SEXPR_H
-#define __CVC4__SEXPR_H
+#ifndef CVC4__SEXPR_H
+#define CVC4__SEXPR_H
 
 #include <iomanip>
 #include <iosfwd>
@@ -301,4 +301,4 @@ std::ostream& operator<<(std::ostream& out, PrettySExprs ps);
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__SEXPR_H */
+#endif /* CVC4__SEXPR_H */

diff --git a/src/util/smt2_quote_string.h b/src/util/smt2_quote_string.h
index 36d542306f964b212ccb58f441d377103f86af23..f91874a2e39ee775cbed05b7f5775aa9f574c687 100644 (file)
--- a/src/util/smt2_quote_string.h
+++ b/src/util/smt2_quote_string.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UTIL__SMT2_QUOTE_STRING_H
-#define __CVC4__UTIL__SMT2_QUOTE_STRING_H
+#ifndef CVC4__UTIL__SMT2_QUOTE_STRING_H
+#define CVC4__UTIL__SMT2_QUOTE_STRING_H
 
 #include <string>
 
@@ -30,4 +30,4 @@ std::string quoteSymbol(const std::string& s);
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UTIL__SMT2_QUOTE_STRING_H */
+#endif /* CVC4__UTIL__SMT2_QUOTE_STRING_H */

diff --git a/src/util/statistics.h b/src/util/statistics.h
index 626db9c702dde5cee24686c6bd0fe4789afc4ad6..68d8d6fda32cc55f34414b74c3060c34a88b3ae8 100644 (file)
--- a/src/util/statistics.h
+++ b/src/util/statistics.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__STATISTICS_H
-#define __CVC4__STATISTICS_H
+#ifndef CVC4__STATISTICS_H
+#define CVC4__STATISTICS_H
 
 #include <iterator>
 #include <ostream>
@@ -132,4 +132,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__STATISTICS_H */
+#endif /* CVC4__STATISTICS_H */

diff --git a/src/util/statistics_registry.cpp b/src/util/statistics_registry.cpp
index cad0e63faea7a6b86d45c10c5155279820bd90de..2ccbc297112943654a694b50862ebf8a3b097f0d 100644 (file)
--- a/src/util/statistics_registry.cpp
+++ b/src/util/statistics_registry.cpp
@@ -26,9 +26,9 @@
 #include "util/ostream_util.h"
 
 #ifdef CVC4_STATISTICS_ON
-#  define __CVC4_USE_STATISTICS true
+#  define CVC4_USE_STATISTICS true
 #else
-#  define __CVC4_USE_STATISTICS false
+#  define CVC4_USE_STATISTICS false
 #endif
 
 
@@ -148,7 +148,7 @@ std::ostream& operator<<(std::ostream& os, const timespec& t) {
 StatisticsRegistry::StatisticsRegistry(const std::string& name) : Stat(name)
 {
   d_prefix = name;
-  if(__CVC4_USE_STATISTICS) {
+  if(CVC4_USE_STATISTICS) {
     PrettyCheckArgument(d_name.find(s_regDelim) == std::string::npos, name,
                         "StatisticsRegistry names cannot contain the string \"%s\"",
                     s_regDelim.c_str());
@@ -194,7 +194,7 @@ void StatisticsRegistry::safeFlushInformation(int fd) const {
 }
 
 void TimerStat::start() {
-  if(__CVC4_USE_STATISTICS) {
+  if(CVC4_USE_STATISTICS) {
     PrettyCheckArgument(!d_running, *this, "timer already running");
     clock_gettime(CLOCK_MONOTONIC, &d_start);
     d_running = true;
@@ -202,7 +202,7 @@ void TimerStat::start() {
 }/* TimerStat::start() */
 
 void TimerStat::stop() {
-  if(__CVC4_USE_STATISTICS) {
+  if(CVC4_USE_STATISTICS) {
     CVC4_CHECK(d_running) << "timer not running";
     ::timespec end;
     clock_gettime(CLOCK_MONOTONIC, &end);
@@ -217,7 +217,7 @@ bool TimerStat::running() const {
 
 timespec TimerStat::getData() const {
   ::timespec data = d_data;
-  if(__CVC4_USE_STATISTICS && d_running) {
+  if(CVC4_USE_STATISTICS && d_running) {
     ::timespec end;
     clock_gettime(CLOCK_MONOTONIC, &end);
     data += end - d_start;
@@ -227,7 +227,7 @@ timespec TimerStat::getData() const {
 
 SExpr TimerStat::getValue() const {
   ::timespec data = d_data;
-  if(__CVC4_USE_STATISTICS && d_running) {
+  if(CVC4_USE_STATISTICS && d_running) {
     ::timespec end;
     clock_gettime(CLOCK_MONOTONIC, &end);
     data += end - d_start;
@@ -253,4 +253,4 @@ RegisterStatistic::~RegisterStatistic() {
 
 }/* CVC4 namespace */
 
-#undef __CVC4_USE_STATISTICS
+#undef CVC4_USE_STATISTICS

diff --git a/src/util/statistics_registry.h b/src/util/statistics_registry.h
index 304d22002baaddac7422a53c8ab15c6210905d01..a369be272d83d0ca1b4e684b8f26787b404dce31 100644 (file)
--- a/src/util/statistics_registry.h
+++ b/src/util/statistics_registry.h
@@ -33,8 +33,8 @@
 
 #include "cvc4_private_library.h"
 
-#ifndef __CVC4__STATISTICS_REGISTRY_H
-#define __CVC4__STATISTICS_REGISTRY_H
+#ifndef CVC4__STATISTICS_REGISTRY_H
+#define CVC4__STATISTICS_REGISTRY_H
 
 #include <stdint.h>
 
@@ -60,9 +60,9 @@ namespace CVC4 {
 std::ostream& operator<<(std::ostream& os, const timespec& t) CVC4_PUBLIC;
 
 #ifdef CVC4_STATISTICS_ON
-#  define __CVC4_USE_STATISTICS true
+#  define CVC4_USE_STATISTICS true
 #else
-#  define __CVC4_USE_STATISTICS false
+#  define CVC4_USE_STATISTICS false
 #endif
 
 
@@ -93,7 +93,7 @@ public:
    */
   Stat(const std::string& name) : d_name(name)
   {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       CheckArgument(d_name.find(", ") == std::string::npos, name,
                     "Statistics names cannot include a comma (',')");
     }
@@ -122,7 +122,7 @@ public:
    * May be redefined by a child class
    */
   virtual void flushStat(std::ostream& out) const {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       out << d_name << ", ";
       flushInformation(out);
     }
@@ -135,7 +135,7 @@ public:
    * May be redefined by a child class
    */
   virtual void safeFlushStat(int fd) const {
-    if (__CVC4_USE_STATISTICS) {
+    if (CVC4_USE_STATISTICS) {
       safe_print(fd, d_name);
       safe_print(fd, ", ");
       safeFlushInformation(fd);
@@ -230,14 +230,14 @@ public:
   /** Flush the value of the statistic to the given output stream. */
   void flushInformation(std::ostream& out) const override
   {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       out << getData();
     }
   }
 
   void safeFlushInformation(int fd) const override
   {
-    if (__CVC4_USE_STATISTICS) {
+    if (CVC4_USE_STATISTICS) {
       safe_print<T>(fd, getDataRef());
     }
   }
@@ -317,7 +317,7 @@ public:
   /** Set this reference statistic to refer to the given data cell. */
   void setData(const T& t) override
   {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       d_data = &t;
     }
   }
@@ -352,14 +352,14 @@ public:
   /** Set the underlying data value to the given value. */
   void setData(const T& t) override
   {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       d_data = t;
     }
   }
 
   /** Identical to setData(). */
   BackedStat<T>& operator=(const T& t) {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       d_data = t;
     }
     return *this;
@@ -443,7 +443,7 @@ public:
 
   /** Increment the underlying integer statistic. */
   IntStat& operator++() {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       ++d_data;
     }
     return *this;
@@ -451,7 +451,7 @@ public:
 
   /** Increment the underlying integer statistic by the given amount. */
   IntStat& operator+=(int64_t val) {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       d_data += val;
     }
     return *this;
@@ -459,7 +459,7 @@ public:
 
   /** Keep the maximum of the current statistic value and the given one. */
   void maxAssign(int64_t val) {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       if(d_data < val) {
         d_data = val;
       }
@@ -468,7 +468,7 @@ public:
 
   /** Keep the minimum of the current statistic value and the given one. */
   void minAssign(int64_t val) {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       if(d_data > val) {
         d_data = val;
       }
@@ -530,7 +530,7 @@ public:
 
   /** Add an entry to the running-average calculation. */
   void addEntry(double e) {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       ++d_count;
       d_sum += e;
       setData(d_sum / d_count);
@@ -589,7 +589,7 @@ public:
 
   void flushInformation(std::ostream& out) const override
   {
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       typename Histogram::const_iterator i = d_hist.begin();
       typename Histogram::const_iterator end =  d_hist.end();
       out << "[";
@@ -608,7 +608,7 @@ public:
 
   void safeFlushInformation(int fd) const override
   {
-    if (__CVC4_USE_STATISTICS) {
+    if (CVC4_USE_STATISTICS) {
       typename Histogram::const_iterator i = d_hist.begin();
       typename Histogram::const_iterator end = d_hist.end();
       safe_print(fd, "[");
@@ -630,7 +630,7 @@ public:
   }
 
   HistogramStat& operator<<(const T& val){
-    if(__CVC4_USE_STATISTICS) {
+    if(CVC4_USE_STATISTICS) {
       if(d_hist.find(val) == d_hist.end()){
         d_hist.insert(std::make_pair(val,0));
       }
@@ -797,8 +797,8 @@ private:
 
 };/* class RegisterStatistic */
 
-#undef __CVC4_USE_STATISTICS
+#undef CVC4_USE_STATISTICS
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__STATISTICS_REGISTRY_H */
+#endif /* CVC4__STATISTICS_REGISTRY_H */

diff --git a/src/util/tuple.h b/src/util/tuple.h
index 0e6b04dabb3a83b206016722c461c7d298280705..13b605794d64be31d74aa425999e6c8e911e87e1 100644 (file)
--- a/src/util/tuple.h
+++ b/src/util/tuple.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__TUPLE_H
-#define __CVC4__TUPLE_H
+#ifndef CVC4__TUPLE_H
+#define CVC4__TUPLE_H
 
 #include <iostream>
 #include <string>
@@ -50,4 +50,4 @@ inline std::ostream& operator<<(std::ostream& out, const TupleUpdate& t) {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__TUPLE_H */
+#endif /* CVC4__TUPLE_H */

diff --git a/src/util/unsafe_interrupt_exception.h b/src/util/unsafe_interrupt_exception.h
index faee0a5cf1d97e57bf41d8515cd26918424799b7..5c8360cdfb4dc3f8c916b4c6bebb272d8d1c1652 100644 (file)
--- a/src/util/unsafe_interrupt_exception.h
+++ b/src/util/unsafe_interrupt_exception.h
@@ -15,8 +15,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__UNSAFE_INTERRUPT_EXCEPTION_H
-#define __CVC4__UNSAFE_INTERRUPT_EXCEPTION_H
+#ifndef CVC4__UNSAFE_INTERRUPT_EXCEPTION_H
+#define CVC4__UNSAFE_INTERRUPT_EXCEPTION_H
 
 #include "base/exception.h"
 
@@ -40,4 +40,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UNSAFE_INTERRUPT_EXCEPTION_H */
+#endif /* CVC4__UNSAFE_INTERRUPT_EXCEPTION_H */

diff --git a/src/util/utility.h b/src/util/utility.h
index e77be32ac54609740ced8c8115a097934264d858..275efd9d0be016634c8623ff9076422cbab224aa 100644 (file)
--- a/src/util/utility.h
+++ b/src/util/utility.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UTILITY_H
-#define __CVC4__UTILITY_H
+#ifndef CVC4__UTILITY_H
+#define CVC4__UTILITY_H
 
 #include <algorithm>
 #include <utility>
@@ -87,4 +87,4 @@ void container_to_stream(std::ostream& out,
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UTILITY_H */
+#endif /* CVC4__UTILITY_H */