From cde0f792f9abe31af1fd660f3e54f1db961b79db Mon Sep 17 00:00:00 2001 From: fche Date: Fri, 31 Jan 2003 17:10:59 +0000 Subject: [PATCH] 2003-01-31 Frank Ch. Eigler * log2.h: #undef log2, in case a macro collides with the function. --- sid/component/cache/ChangeLog | 4 ++++ sid/component/cache/log2.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sid/component/cache/ChangeLog b/sid/component/cache/ChangeLog index 44b7b00767..9e96e81bb8 100644 --- a/sid/component/cache/ChangeLog +++ b/sid/component/cache/ChangeLog @@ -1,3 +1,7 @@ +2003-01-31 Frank Ch. Eigler + + * log2.h: #undef log2, in case a macro collides with the function. + 2002-07-16 Dave Brolley * cache.h (cache): Add flush_and_invalidate_set_pin and diff --git a/sid/component/cache/log2.h b/sid/component/cache/log2.h index 1b485e74ac..057ddd8135 100644 --- a/sid/component/cache/log2.h +++ b/sid/component/cache/log2.h @@ -25,6 +25,9 @@ bool power_of_two_p (const V& v1) // Compute log2 (V). +// Zap a possible math.h macro by this name +#undef log2 + template unsigned log2 (const V& v1) { -- 2.11.0