2 files changed, 12 insertions, 8 deletions
diff --git a/akregator/src/mk4storage/metakit/include/mk4.inl b/akregator/src/mk4storage/metakit/include/mk4.inl
index 1c717a367..51236ffec 100644
--- a/akregator/src/mk4storage/metakit/include/mk4.inl
+++ b/akregator/src/mk4storage/metakit/include/mk4.inl
@@ -283,8 +283,8 @@ d4_inline bool operator!= (c4_Cursor a_, c4_Cursor b_)
 
 d4_inline bool operator< (c4_Cursor a_, c4_Cursor b_)
 {
-  return a_._seq < b_._seq ||
-	  a_._seq == b_._seq && a_._index < b_._index;
+  return (a_._seq < b_._seq) ||
+	  ((a_._seq == b_._seq) && (a_._index < b_._index));
 }
 
 d4_inline bool operator> (c4_Cursor a_, c4_Cursor b_)
diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp
index 2d191c645..2e8f24d15 100644
--- a/akregator/src/mk4storage/metakit/src/column.cpp
+++ b/akregator/src/mk4storage/metakit/src/column.cpp
@@ -428,17 +428,21 @@ void c4_Column::MoveGapTo(t4_i32 pos_)
 {
   d4_assert(pos_ <= _size);
 
-  if (_slack == 0)      // if there is no real gap, then just move it
+  if (_slack == 0) {      // if there is no real gap, then just move it
     _gap = pos_;
-  else if (_gap < pos_)   // move the gap up, ie. some bytes down
+  }
+  else if (_gap < pos_) {   // move the gap up, ie. some bytes down
     MoveGapUp(pos_);
-  else if (_gap > pos_)   // move the gap down, ie. some bytes up
+  }
+  else if (_gap > pos_) {   // move the gap down, ie. some bytes up
     if (_gap - pos_ > _size - _gap + fSegRest(pos_)) {
       RemoveGap();    // it's faster to get rid of the gap instead
       _gap = pos_;
     }
-    else          // normal case, move some bytes up
+    else {          // normal case, move some bytes up
       MoveGapDown(pos_);
+    }
+  }
 
   d4_assert(_gap == pos_);
 
@@ -1201,11 +1205,11 @@ void c4_ColOfInts::SetAccessWidth(int bits_)
     ++l2bp1;
     bits_ >>= 1;
   }
-  d4_assert(0 <= l2bp1 && l2bp1 < 8);
+  d4_assert((0 <= l2bp1) && (l2bp1 < 8));
 
   _currWidth = (1 << l2bp1) >> 1;
 
-  if (l2bp1 > 4 && (_mustFlip || Persist() != 0 && Strategy()._bytesFlipped))
+  if (l2bp1 > 4 && (_mustFlip || ((Persist() != 0) && Strategy()._bytesFlipped)))
     l2bp1 += 3; // switch to the trailing entries for byte flipping
 
     // Metrowerks Codewarrior 11 is dumb, it requires the "&c4_ColOfInts::"