[rhmessaging-commits] rhmessaging commits: r1436 - store/trunk/cpp/tests/jrnl.

[rhmessaging-commits at lists.jboss.org]

Author: aconway
Date: 2007-12-06 12:59:43 -0500 (Thu, 06 Dec 2007)
New Revision: 1436

Modified:
   store/trunk/cpp/tests/jrnl/unit_test_file_hdr.cpp
Log:
tests/jrnl/unit_test_file_hdr.cpp: Replace #ifdefs with casts.


Modified: store/trunk/cpp/tests/jrnl/unit_test_file_hdr.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/unit_test_file_hdr.cpp	2007-12-06 15:22:58 UTC (rev 1435)
+++ store/trunk/cpp/tests/jrnl/unit_test_file_hdr.cpp	2007-12-06 17:59:43 UTC (rev 1436)
@@ -151,15 +151,9 @@
         BOOST_CHECK_EQUAL(fh1._hdr._uflag, 0);
         BOOST_CHECK_EQUAL(fh1._hdr._rid, 0ULL);
         BOOST_CHECK_EQUAL(fh1._fid, 0UL);
-#ifdef JRNL_32_BIT
-        BOOST_CHECK_EQUAL(fh1._fro, 0UL);
-        BOOST_CHECK_EQUAL(fh1._ts_sec, 0L);
-        BOOST_CHECK_EQUAL(fh1._ts_nsec, 0UL);
-#else
-        BOOST_CHECK_EQUAL(fh1._fro, 0ULL);
-        BOOST_CHECK_EQUAL(fh1._ts_sec, 0LL);
-        BOOST_CHECK_EQUAL(fh1._ts_nsec, 0ULL);
-#endif
+        BOOST_CHECK_EQUAL(fh1._fro, size_t(0));
+        BOOST_CHECK_EQUAL(fh1._ts_sec, time_t(0));
+        BOOST_CHECK_EQUAL(fh1._ts_nsec, uint32_t(0));
         BOOST_CHECK(!fh1.get_owi());
     }
 
@@ -176,17 +170,12 @@
         BOOST_CHECK_EQUAL(fh2._hdr._rid, rid);
         BOOST_CHECK_EQUAL(fh2._fid,fid );
         BOOST_CHECK_EQUAL(fh2._fro, fro);
-#ifdef JRNL_32_BIT
-        BOOST_CHECK_EQUAL(fh2._ts_sec, 0L);
-        BOOST_CHECK_EQUAL(fh2._ts_nsec, 0UL);
-#else
-        BOOST_CHECK_EQUAL(fh2._ts_sec, 0ULL);
-        BOOST_CHECK_EQUAL(fh2._ts_nsec, 0ULL);
-#endif
+        BOOST_CHECK_EQUAL(fh2._ts_sec, time_t(0));
+        BOOST_CHECK_EQUAL(fh2._ts_nsec, uint32_t(0));
         ::clock_gettime(CLOCK_REALTIME, &ts);
         fh2.set_time(ts);
         BOOST_CHECK_EQUAL(fh2._ts_sec, ts.tv_sec);
-        BOOST_CHECK_EQUAL(fh2._ts_nsec, (u_int32_t)ts.tv_nsec);
+        BOOST_CHECK_EQUAL(fh2._ts_nsec, u_int32_t(ts.tv_nsec));
         BOOST_CHECK(fh2.get_owi());
 
         fh2._hdr._uflag = uflag;
@@ -240,13 +229,8 @@
         BOOST_CHECK_EQUAL(eh1._hdr._eflag, 0);
         BOOST_CHECK_EQUAL(eh1._hdr._uflag, 0);
         BOOST_CHECK_EQUAL(eh1._hdr._rid, 0ULL);
-#ifdef JRNL_32_BIT
-        BOOST_CHECK_EQUAL(eh1._xidsize, 0UL);
-        BOOST_CHECK_EQUAL(eh1._dsize, 0UL);
-#else
-        BOOST_CHECK_EQUAL(eh1._xidsize, 0ULL);
-        BOOST_CHECK_EQUAL(eh1._dsize, 0ULL);
-#endif
+        BOOST_CHECK_EQUAL(eh1._xidsize, size_t(0));
+        BOOST_CHECK_EQUAL(eh1._dsize, size_t(0));
         BOOST_CHECK(!eh1.get_owi());
     }
 
@@ -351,11 +335,7 @@
         BOOST_CHECK_EQUAL(dh1._hdr._uflag, 0);
         BOOST_CHECK_EQUAL(dh1._hdr._rid, 0ULL);
         BOOST_CHECK_EQUAL(dh1._deq_rid, 0ULL);
-#ifdef JRNL_32_BIT
-        BOOST_CHECK_EQUAL(dh1._xidsize, 0UL);
-#else
-        BOOST_CHECK_EQUAL(dh1._xidsize, 0ULL);
-#endif
+        BOOST_CHECK_EQUAL(dh1._xidsize, size_t(0));
         BOOST_CHECK(!dh1.get_owi());
     }
 
@@ -407,11 +387,7 @@
         BOOST_CHECK_EQUAL(th1._hdr._eflag, 0);
         BOOST_CHECK_EQUAL(th1._hdr._uflag, 0);
         BOOST_CHECK_EQUAL(th1._hdr._rid, 0ULL);
-#ifdef JRNL_32_BIT
-        BOOST_CHECK_EQUAL(th1._xidsize, 0UL);
-#else
-        BOOST_CHECK_EQUAL(th1._xidsize, 0ULL);
-#endif
+        BOOST_CHECK_EQUAL(th1._xidsize, size_t(0));
         BOOST_CHECK(!th1.get_owi());
     }