From e0c20921233c68ca0271467ab739ab43cbd8d59c Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Fri, 3 Nov 2000 10:04:06 +0000 Subject: [PATCH] * include/cln/object.h (cl_combine): define additional signatures, if HAVE_LONGLONG is defined, in order to keep the compiler happy. * src/base/cl_macros.h: include "cln/types.h", since we need HAVE_DD... * src/base/cl_macros.h (bit): ...for this macro... * src/base/cl_macros.h (minus_bit): ...and this one. * src/base/cl_low.h: include "cln/types.h", since we need HAVE_DD... * src/base/cl_low.h (logcount_64): ...for this macro. * src/base/random/cl_UL_random.cc (random32): if HAVE_DD a is an ULL. * src/integer/gcd/cl_I_gcd_aux2.cc (floorDD): fixed algorithmic bug that turned up when intDsize==32 and cl_word_size==64. * src/float/dfloat/elem/cl_DF_div.cc (operator/): fixed a missing cast to uint64 that turned up when intDsize==32 and cl_word_size==64. --- include/cln/object.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/cln/object.h b/include/cln/object.h index 12857d9..0bb880f 100644 --- a/include/cln/object.h +++ b/include/cln/object.h @@ -126,9 +126,15 @@ inline cl_uint cl_combine (cl_uint tag, cl_sint value) } // Keep the compiler happy. inline cl_uint cl_combine (cl_uint tag, unsigned int value) -{ return cl_combine(tag,(cl_uint)value); } +{ return cl_combine(tag, (cl_uint)value); } inline cl_uint cl_combine (cl_uint tag, int value) -{ return cl_combine(tag,(cl_sint)value); } +{ return cl_combine(tag, (cl_sint)value); } +#ifdef HAVE_LONGLONG +inline cl_uint cl_combine (cl_uint tag, unsigned long long value) +{ return cl_combine(tag, (cl_uint)value); } +inline cl_uint cl_combine (cl_uint tag, long long value) +{ return cl_combine(tag, (cl_uint)value); } +#endif // Definition of the tags. #if !defined(CL_WIDE_POINTERS)