commit 7b0d8834f2d762f610291a1c4ffe1f775f46a5f1 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 16 12:57:27 2019 -0500

Use raw_assert in ht.h

Also, include torerr.h from ht.h if we are using raw_assert.

Otherwise, our includes need to be ordered so that ht.h comes after util_log.h. --- src/ext/ht.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ext/ht.h b/src/ext/ht.h index bb5604131..9d4add193 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -226,7 +226,8 @@ ht_string_hash(const char *s) (x) = HT_NEXT(name, head, x))

#ifndef HT_NDEBUG -#define HT_ASSERT_(x) tor_assert(x) +#include "lib/err/torerr.h" +#define HT_ASSERT_(x) raw_assert(x) #else #define HT_ASSERT_(x) (void)0 #endif