* lib/popcount.h: Use verify_true instead of if...abort.

* modules/popcount: Depend on verify module.
Suggested by Jim Meyering.

diff --git a/ChangeLog b/ChangeLog
index f08030f7dfbdee206fcaf48d6e3874993bc6cfb7..c8c539dc4765b799a8ffeea76ccd6e9f63864ab8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-23  Ben Pfaff  <blp@gnu.org>
+
+       * lib/popcount.h: Use verify_true instead of if...abort.
+       * modules/popcount: Depend on verify module.
+       Suggested by Jim Meyering.
+
 2007-07-23  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_import): Create a .cvsignore file also when the

diff --git a/lib/popcount.h b/lib/popcount.h
index b7084cbe39cd45477438ed3449aa68e605ef8fe8..6c19de2d626b2560d59e6fc6b41a2d7f3ba07518 100644 (file)
--- a/lib/popcount.h
+++ b/lib/popcount.h
@@ -22,17 +22,17 @@
 
 #include <limits.h>
 #include <stdlib.h>
+#include "verify.h"
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR >= 4)
 #define POPCOUNT_CALCULATION(NAME, TYPE)        \
         return __builtin_##NAME (x);
 #else
-#define POPCOUNT_CALCULATION(NAME, TYPE)        \
-        int pop = popcount32 (x);               \
-        if (CHAR_BIT * sizeof (TYPE) > 32)      \
-          pop += popcount32 (x >> 31 >> 1);     \
-        if (CHAR_BIT * sizeof (TYPE) > 64)      \
-          abort ();                             \
+#define POPCOUNT_CALCULATION(NAME, TYPE)                        \
+        int pop = popcount32 (x);                               \
+        if (CHAR_BIT * sizeof (TYPE) > 32)                      \
+          pop += popcount32 (x >> 31 >> 1);                     \
+        (void) verify_true (CHAR_BIT * sizeof (TYPE) <= 64);    \
         return pop;
 
 /* Compute and return the population count of the low 32 bits of

diff --git a/modules/popcount b/modules/popcount
index 885894d3925d61e8b3ee788ec70d8634ea531141..45fd56b70fada4f5576247169ac6988e211d5a23 100644 (file)
--- a/modules/popcount
+++ b/modules/popcount
@@ -7,6 +7,7 @@ m4/popcount.m4
 
 Depends-on:
 inline
+verify
 
 configure.ac:
 gl_POPCOUNT