From 89744cb8472d8f563fc522a911ad65d0a5eb7bd9 Mon Sep 17 00:00:00 2001 From: trevor_hansen Date: Tue, 10 Apr 2012 07:04:29 +0000 Subject: [PATCH] Fix build. Remove some casts that I don't need on my machine. git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@1638 e59a4935-1847-0410-ae03-e826735625c1 --- src/util/test_cbitp.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/test_cbitp.cpp b/src/util/test_cbitp.cpp index 1c51988..42ff756 100644 --- a/src/util/test_cbitp.cpp +++ b/src/util/test_cbitp.cpp @@ -342,7 +342,7 @@ namespace simplifier { - for (long j = 0; j < pow((double)3, totalLength); j++) + for (long j = 0; j < pow(3, totalLength); j++) { FixedBits output(resultLength, signature.resultType == BOOL_TYPE); @@ -413,7 +413,7 @@ namespace simplifier imprecise = true; checkEqual(children, output, transfer, kind, imprecise,d); - assert(!d.conflicts); + assert(!d.conflict); initial += d.initial; transferC += d.transferFixed; @@ -465,7 +465,7 @@ namespace simplifier lengths.push_back(resultLength); totalLength += resultLength; - for (long j = 0; j < pow((double)3, totalLength); j++) + for (long j = 0; j < pow(3, totalLength); j++) { int current = j; @@ -560,10 +560,10 @@ exhaustively_check(const int bitwidth, Result (*transfer)(vector&, F const int numberOfInputParams = 2; assert(numberOfInputParams >0); - const int mask = pow((double)2, bitwidth) - 1; + const int mask = pow(2, bitwidth) - 1; // Create all the possible inputs, and apply the function. - for (int i = 0; i < pow((double)2, bitwidth * numberOfInputParams); i++) + for (int i = 0; i < pow(2, bitwidth * numberOfInputParams); i++) { D d; d.a = i & mask; @@ -598,7 +598,7 @@ exhaustively_check(const int bitwidth, Result (*transfer)(vector&, F FixedBits empty(bitwidth, false); FixedBits c_a(bitwidth, false), c_b(bitwidth, false), c_o(bitwidth, false); - const int to_iterate = pow((double)3, totalLength); + const int to_iterate = pow(3, totalLength); for (long j = 0; j < to_iterate; j++) { int current = j; -- 2.47.3