From 1986de038dfa311ad6d1becb525c83059008f1e6 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Thu, 21 Aug 2008 00:15:01 +0000
Subject: [PATCH] bug fix

---
 Robust/src/IR/Flat/BuildCode.java        | 4 ++--
 Robust/src/Runtime/DSTM/interface/dstm.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 6e1641fd..89e549f1 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -1987,7 +1987,7 @@ public class BuildCode {
       String dst=generateTemp(fm,fsfn.getDst(),lb);
       if (srcglobal) {
 	output.println("{");
-	output.println("int srcoid="+src+"!=NULL?((int)"+src+"->"+oidstr+"):0);");
+	output.println("int srcoid=("+src+"!=NULL?((int)"+src+"->"+oidstr+"):0);");
       }
       if (statusdst.equals(LocalityAnalysis.GLOBAL)) {
 	String glbdst=dst;
@@ -2119,7 +2119,7 @@ public class BuildCode {
       if (srcglobal) {
 	output.println("{");
 	String src=generateTemp(fm, fsen.getSrc(), lb);
-	output.println("int srcoid="+src+"!=NULL?((int)"+src+"->"+oidstr+"):0);");
+	output.println("int srcoid=("+src+"!=NULL?((int)"+src+"->"+oidstr+"):0);");
 	output.println("((int*)(((char *) &("+ generateTemp(fm,fsen.getDst(),lb)+"->___length___))+sizeof(int)))["+generateTemp(fm, fsen.getIndex(),lb)+"]=srcoid;");
 	output.println("}");
       } else {
diff --git a/Robust/src/Runtime/DSTM/interface/dstm.h b/Robust/src/Runtime/DSTM/interface/dstm.h
index fab894a8..d4091a22 100644
--- a/Robust/src/Runtime/DSTM/interface/dstm.h
+++ b/Robust/src/Runtime/DSTM/interface/dstm.h
@@ -105,7 +105,7 @@ typedef struct objheader {
   (*((unsigned int *)&((struct ___Object___ *)((unsigned int) x + sizeof(objheader_t)))->___nextobject___))
 
 #define COMPOID(x) \
-  ((void*)(((void *) x )!=NULL)?(*((unsigned int *)&((struct ___Object___ *) x)->___nextobject___))):0
+  ((void*)((((void *) x )!=NULL)?(*((unsigned int *)&((struct ___Object___ *) x)->___nextobject___)):0))
 
 #define STATUS(x) \
   *((unsigned int *) &(((struct ___Object___ *)((unsigned int) x + sizeof(objheader_t)))->___localcopy___))
-- 
2.34.1