diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-24 13:25:30 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-24 13:25:30 -0500 |
| commit | a70dfd183b52f50d132d8b17425c7089a77004e7 (patch) | |
| tree | 41d783cff1f6097bd76b77c561bbd77111317437 /src/util | |
| parent | 371fa29e5742a58581481f3d7d94a8116a814447 (diff) | |
| parent | e23a40c0d121209afecff21ce5c6ed6e644bfb0e (diff) | |
Merge branch '1.3.x'
Conflicts:
NEWS
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/backtrackable.h | 2 | ||||
| -rw-r--r-- | src/util/bool.h | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/util/backtrackable.h b/src/util/backtrackable.h index c5844c6c4..57ed94771 100644 --- a/src/util/backtrackable.h +++ b/src/util/backtrackable.h @@ -170,7 +170,7 @@ void List<T>::concat (List<T>* other) { template <class T> void List<T>::unconcat(List<T>* other) { // we do not need to check consistency since this is only called by the - //Backtracker when we are inconsistent + // Backtracker when we are inconsistent Assert(other->ptr_to_head != NULL); other->ptr_to_head->next = NULL; tail = other->ptr_to_head; diff --git a/src/util/bool.h b/src/util/bool.h index 8e3c8849c..373b4fdec 100644 --- a/src/util/bool.h +++ b/src/util/bool.h @@ -9,15 +9,9 @@ ** See the file COPYING in the top-level source directory for licensing ** information.\endverbatim ** - ** \brief A multi-precision rational constant. + ** \brief A hash function for Boolean ** - ** A multi-precision rational constant. - ** This stores the rational as a pair of multi-precision integers, - ** one for the numerator and one for the denominator. - ** The number is always stored so that the gcd of the numerator and denominator - ** is 1. (This is referred to as referred to as canonical form in GMP's - ** literature.) A consequence is that that the numerator and denominator may be - ** different than the values used to construct the Rational. + ** A hash function for Boolean. **/ #include "cvc4_public.h" |