diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-04-08 20:49:11 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-04-08 20:49:11 +0000 |
| commit | c3a6ff8c6e4a0c743cd33eb29931f837eeb2959e (patch) | |
| tree | df8d8a97baebea55aaf94cc816974a86475c3a4b /test/unit/util/rational_white.h | |
| parent | de2b6c4ee9c2ecad88bddd0a60f10e94d6f8c71f (diff) | |
A handful of build system fixes:
* (test/unit/Makefile.am) libtool was being passed relative paths of
sources in .cpp, confusing lcov if -b wasn't given. Fixed.
Closes bug #102.
* (configure.ac) --enable-coverage now implies --enable-static
--enable-static-binary --disable-shared.
* (configure.ac) Create top-level config.status for informational and
re-configuration purposes.
* (configure.ac) Remove -fvisibility=hidden for debug builds.
Closes bug #104.
* (test/unit/Makefile.am) Build unit tests with -Wall.
* (various unit tests) Fixed trivially-fixable warnings in building
unit tests. (Signedness in comparison, unused variables, etc.)
* (Makefile.builds.in) Copy the binary correctly if it is static.
(It was failing, but only with --enable-static --enable-shared
--enable-static-binary.) Closes bug #103.
* (src/parser/Makefile.am) libcvc4parser.so now links with libcvc4.so.
* Other minor cleanups to the build system.
Diffstat (limited to 'test/unit/util/rational_white.h')
| -rw-r--r-- | test/unit/util/rational_white.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/test/unit/util/rational_white.h b/test/unit/util/rational_white.h index 559b457cb..8a7f04fd3 100644 --- a/test/unit/util/rational_white.h +++ b/test/unit/util/rational_white.h @@ -104,26 +104,26 @@ public: Rational y(78,6); Rational z(45789,1); - TS_ASSERT_EQUALS(x.getNumerator().getUnsignedLong(), 0); - TS_ASSERT_EQUALS(y.getNumerator().getUnsignedLong(), 13); - TS_ASSERT_EQUALS(z.getNumerator().getUnsignedLong(), 45789); + TS_ASSERT_EQUALS(x.getNumerator().getUnsignedLong(), 0ul); + TS_ASSERT_EQUALS(y.getNumerator().getUnsignedLong(), 13ul); + TS_ASSERT_EQUALS(z.getNumerator().getUnsignedLong(), 45789ul); x = y = z; - TS_ASSERT_EQUALS(x.getNumerator().getUnsignedLong(), 45789); - TS_ASSERT_EQUALS(y.getNumerator().getUnsignedLong(), 45789); - TS_ASSERT_EQUALS(z.getNumerator().getUnsignedLong(), 45789); + TS_ASSERT_EQUALS(x.getNumerator().getUnsignedLong(), 45789ul); + TS_ASSERT_EQUALS(y.getNumerator().getUnsignedLong(), 45789ul); + TS_ASSERT_EQUALS(z.getNumerator().getUnsignedLong(), 45789ul); Rational a(78,91); y = a; - TS_ASSERT_EQUALS(a.getNumerator().getUnsignedLong(), 6); - TS_ASSERT_EQUALS(a.getDenominator().getUnsignedLong(), 7); - TS_ASSERT_EQUALS(y.getNumerator().getUnsignedLong(), 6); - TS_ASSERT_EQUALS(y.getDenominator().getUnsignedLong(), 7); - TS_ASSERT_EQUALS(x.getNumerator().getUnsignedLong(), 45789); - TS_ASSERT_EQUALS(z.getNumerator().getUnsignedLong(), 45789); + TS_ASSERT_EQUALS(a.getNumerator().getUnsignedLong(), 6ul); + TS_ASSERT_EQUALS(a.getDenominator().getUnsignedLong(), 7ul); + TS_ASSERT_EQUALS(y.getNumerator().getUnsignedLong(), 6ul); + TS_ASSERT_EQUALS(y.getDenominator().getUnsignedLong(), 7ul); + TS_ASSERT_EQUALS(x.getNumerator().getUnsignedLong(), 45789ul); + TS_ASSERT_EQUALS(z.getNumerator().getUnsignedLong(), 45789ul); } void testToStringStuff(){ @@ -416,8 +416,8 @@ public: Rational one_word(75890L,590L); Rational two_words("7890D789D33234027890D789D3323402", 16); - TS_ASSERT_EQUALS(zero.hash(), 1); - TS_ASSERT_EQUALS(one_word.hash(), 7589 xor 59); + TS_ASSERT_EQUALS(zero.hash(), 1u); + TS_ASSERT_EQUALS(one_word.hash(), 7589u xor 59u); TS_ASSERT_EQUALS(two_words.hash(), (two_words.getNumerator().hash()) xor 1); TS_ASSERT_EQUALS(large.hash(), |