diff options
author | Mathias Preiner <mathias.preiner@gmail.com> | 2019-04-24 15:39:24 -0700 |
---|---|---|
committer | Andres Noetzli <andres.noetzli@gmail.com> | 2019-04-24 15:39:24 -0700 |
commit | 2ab48defab1f0c8918cd7612c1943be7503e4d30 (patch) | |
tree | ab8fafc614f5fceef133a3a32f27a0fddcd3c717 /src/util | |
parent | 5f716f5aac730f976eac538cfbf47dcc651e54f7 (diff) |
Do not use __ prefix for header guards. (#2974)
Fixes 2887.
Diffstat (limited to 'src/util')
32 files changed, 119 insertions, 119 deletions
diff --git a/src/util/bin_heap.h b/src/util/bin_heap.h index be54dfa03..d6a7c95d7 100644 --- 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 8b1d58e80..f13db5417 100644 --- 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 1c88ad601..32f3741f8 100644 --- 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 b3021db64..b06d72286 100644 --- 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 8587800c1..00776921f 100644 --- 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 516908d3d..e25ca8168 100644 --- 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 f545ab9d8..a0c730436 100644 --- 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 5ba02b30f..bac0fbd59 100644 --- 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 2bc4a392f..3ba388564 100644 --- 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 ef8567464..14167bc82 100644 --- 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 8000c049a..2ee6ff19e 100644 --- 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 4b030efa8..aba5b6a3a 100644 --- 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 f9cf3b6e2..144e88536 100644 --- 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 c3247d307..33c6c6511 100644 --- 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 d5fd93ce9..45d30a01c 100644 --- 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 1440d0a91..ac129e3aa 100644 --- 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 d031a6b80..0b46a1f04 100644 --- 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 03bda2c7d..660c4b075 100644 --- 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 ab4b5c5a8..ff8a0f776 100644 --- 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 64b05b900..f7c6fb2ae 100644 --- 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 03fcfaffb..264565a76 100644 --- 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 29fef9362..f34a9bb5a 100644 --- 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 a8a096d11..75a517b18 100644 --- 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 0c727d8d4..aa473ba0c 100644 --- 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 573b4fcd4..bdc85df41 100644 --- 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 36d542306..f91874a2e 100644 --- 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 626db9c70..68d8d6fda 100644 --- 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 cad0e63fa..2ccbc2971 100644 --- 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 304d22002..a369be272 100644 --- 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 0e6b04dab..13b605794 100644 --- 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 faee0a5cf..5c8360cdf 100644 --- 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 e77be32ac..275efd9d0 100644 --- 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 */ |