From a388ca19ee7871035610ac7c46e41a332afde938 Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Mon, 10 Mar 2008 13:49:10 -0600
Subject: [PATCH] fix build for GCC 4.3

Note that this requires removing the -Wconversion flag for now.  I'll
see about restoring it when I'm ready to tackle all those warnings.
---
 makefile      | 3 +--
 src/heap.cpp  | 2 +-
 src/machine.h | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/makefile b/makefile
index bb5852f6d7..799eaf6402 100644
--- a/makefile
+++ b/makefile
@@ -52,8 +52,7 @@ strip-all = --strip-all
 
 rdynamic = -rdynamic
 
-warnings = -Wall -Wextra -Werror -Wunused-parameter \
-	-Winit-self -Wconversion
+warnings = -Wall -Wextra -Werror -Wunused-parameter -Winit-self
 
 common-cflags = $(warnings) -fno-rtti -fno-exceptions \
 	-I$(JAVA_HOME)/include -idirafter $(src) -I$(native-build) \
diff --git a/src/heap.cpp b/src/heap.cpp
index b442a40344..ffcbc45fa1 100644
--- a/src/heap.cpp
+++ b/src/heap.cpp
@@ -78,7 +78,7 @@ set(void** o, void* value)
 {
   *o = reinterpret_cast<void*>
     (reinterpret_cast<uintptr_t>(value)
-     | reinterpret_cast<uintptr_t>(*o) & (~PointerMask));
+     | (reinterpret_cast<uintptr_t>(*o) & (~PointerMask)));
 }
 
 inline void
diff --git a/src/machine.h b/src/machine.h
index 6e9ff42a01..33af90fa2e 100644
--- a/src/machine.h
+++ b/src/machine.h
@@ -1484,7 +1484,7 @@ setObjectClass(Thread*, object o, object value)
   cast<object>(o, 0)
     = reinterpret_cast<object>
     (reinterpret_cast<uintptr_t>(value)
-     | reinterpret_cast<uintptr_t>(cast<object>(o, 0)) & (~PointerMask));
+     | (reinterpret_cast<uintptr_t>(cast<object>(o, 0)) & (~PointerMask)));
 }
 
 object&