From 105d00b9b83711269647b86488adfa8aedb85a7f Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 1 Nov 2010 10:26:34 -0500 Subject: [PATCH] Fix ambiguous call to abs(). Observed on FreeBSD build that the compiler would emit an error claiming Val(abs(val.int_val), TYPE_COUNT) is ambiguous because it can't make a choice between cstdlib's "int abs(int)" or "long abs(long)" signatures. And actually, since we now always use 64 bit integers for bro_int_t, we can use "long long llabs(long long)". --- src/Val.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Val.cc b/src/Val.cc index 91c0159158..9a1ee700ff 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -524,7 +524,7 @@ Val* Val::SizeVal() const { switch ( type->InternalType() ) { case TYPE_INTERNAL_INT: - return new Val(abs(val.int_val), TYPE_COUNT); + return new Val(llabs(val.int_val), TYPE_COUNT); case TYPE_INTERNAL_UNSIGNED: return new Val(val.uint_val, TYPE_COUNT);