diff --git a/gm/dlmgr.t b/gm/dlmgr.t
index 258daa0be02b1f210d037aba902269888b58fcd5..072a372245d4423b993fd727603df211b62d130d 100644
--- a/gm/dlmgr.t
+++ b/gm/dlmgr.t
@@ -255,7 +255,7 @@ LINK(OTYPE)
IFDEBUG(gm,2)
printf("GRID_LINK_" STR(OTYPE) "():" STR(OTYPE)
- " has listpart=%d for prio=%d obj=%p\n",listpart,Prio,Object);
+ " has listpart=%d for prio=%d obj=%p\n", listpart, Prio, (void*) Object);
fflush(stdout);
ENDDEBUG
@@ -437,7 +437,8 @@ LINKX(OTYPE)
{
IFDEBUG(gm,2)
printf(" GRID_LINKX_" STR(OTYPE) "():" STR(OTYPE)
- " calling GRID_LINK_" STR(OTYPE) "(): Object=%p After=%p \n",Object,After);
+ " calling GRID_LINK_" STR(OTYPE) "(): Object=%p After=%p \n",
+ (void*) Object, (void*) After);
ENDDEBUG
CAT(GRID_LINK_,OTYPE) (Grid,Object,Prio);
@@ -460,7 +461,7 @@ LINKX(OTYPE)
IFDEBUG(gm,2)
printf("GRID_LINKX_" STR(OTYPE) "():" STR(OTYPE)
- " has listpart=%d for prio=%d obj=%p\n",listpart,Prio,Object);
+ " has listpart=%d for prio=%d obj=%p\n", listpart, Prio, (void*) Object);
fflush(stdout);
ENDDEBUG
@@ -600,20 +601,20 @@ PRINT_LIST(OTYPE)
if (prios==2)
{
printf (" fg=%p fg=%p fm=%p lm=%p\n",
- CAT(LISTPART_FIRST,OTYPE(Grid,0)),
- CAT(LISTPART_LAST,OTYPE(Grid,0)),
- CAT(LISTPART_FIRST,OTYPE(Grid,1)),
- CAT(LISTPART_LAST,OTYPE(Grid,1)));
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,0)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,0)),
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,1)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,1)));
}
else
{
printf (" fg=%p fg=%p fb=%p lb=%p fm=%p lm=%p\n",
- CAT(LISTPART_FIRST,OTYPE(Grid,0)),
- CAT(LISTPART_LAST,OTYPE(Grid,0)),
- CAT(LISTPART_FIRST,OTYPE(Grid,1)),
- CAT(LISTPART_LAST,OTYPE(Grid,1)),
- CAT(LISTPART_FIRST,OTYPE(Grid,2)),
- CAT(LISTPART_LAST,OTYPE(Grid,2)));
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,0)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,0)),
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,1)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,1)),
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,2)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,2)));
}
}
diff --git a/parallel/ddd/xfer/unpack.cc b/parallel/ddd/xfer/unpack.cc
index 886e77583b5a34f85ab59cccef514a5f32b7a3aa..4d132c5d18e650ed57695e696e9b96aeadc46348 100644
--- a/parallel/ddd/xfer/unpack.cc
+++ b/parallel/ddd/xfer/unpack.cc
@@ -1072,7 +1072,7 @@ static void LocalizeSymTab (DDD::DDDContext& context, LC_MSGHANDLE xm,
}
-static void LocalizeObjects (DDD::DDDContext& context, LC_MSGHANDLE xm, int required_newness)
+static void LocalizeObjects (DDD::DDDContext& context, LC_MSGHANDLE xm, bool required_newness)
{
auto& ctx = context.xferContext();
const SYMTAB_ENTRY *theSymTab;
@@ -1090,7 +1090,7 @@ static void LocalizeObjects (DDD::DDDContext& context, LC_MSGHANDLE xm, int requ
for(i=0; i<lenObjTab; i++) /* for all message items */
{
- if (required_newness==TOTALNEW && theObjTab[i].is_new==TOTALNEW)
+ if (required_newness && theObjTab[i].is_new==TOTALNEW)
{
TYPE_DESC *desc = &context.typeDefs()[OBJ_TYPE(theObjTab[i].hdr)];
DDD_OBJ obj = HDR2OBJ(theObjTab[i].hdr, desc);
@@ -1107,7 +1107,7 @@ static void LocalizeObjects (DDD::DDDContext& context, LC_MSGHANDLE xm, int requ
#ifdef MERGE_MODE_IN_TESTZUSTAND
- if (required_newness!=TOTALNEW && theObjTab[i].is_new!=TOTALNEW)
+ if (required_newness && theObjTab[i].is_new!=TOTALNEW)
{
/*
implemented merge_mode for Localize. references from all copies
@@ -1166,7 +1166,7 @@ static void CallUpdateHandler (DDD::DDDContext& context, LC_MSGHANDLE xm)
-static void UnpackAddData (DDD::DDDContext& context, LC_MSGHANDLE xm, int required_newness)
+static void UnpackAddData (DDD::DDDContext& context, LC_MSGHANDLE xm, bool required_newness)
{
auto& ctx = context.xferContext();
SYMTAB_ENTRY *theSymTab;
@@ -1189,7 +1189,7 @@ static void UnpackAddData (DDD::DDDContext& context, LC_MSGHANDLE xm, int requir
{
int newness = -1;
- if (required_newness==TOTALNEW)
+ if (required_newness)
{
if (theObjTab[i].is_new==TOTALNEW)
{
@@ -1296,7 +1296,7 @@ static void CallSetPriorityHandler (DDD::DDDContext& context, LC_MSGHANDLE xm)
-static void CallObjMkConsHandler (DDD::DDDContext& context, LC_MSGHANDLE xm, int required_newness)
+static void CallObjMkConsHandler (DDD::DDDContext& context, LC_MSGHANDLE xm, bool required_newness)
{
auto& ctx = context.xferContext();
OBJTAB_ENTRY *theObjTab;
@@ -1314,7 +1314,7 @@ static void CallObjMkConsHandler (DDD::DDDContext& context, LC_MSGHANDLE xm, int
{
int newness = -1;
- if (required_newness==TOTALNEW)
+ if (required_newness)
{
if (theObjTab[i].is_new==TOTALNEW)
{
@@ -1614,8 +1614,8 @@ void XferUnpack (DDD::DDDContext& context, LC_MSGHANDLE *theMsgs, int nRecvMsgs,
/* unpack all messages and update local topology */
- for(i=0; i<nRecvMsgs; i++) LocalizeObjects(context, theMsgs[i], TOTALNEW);
- for(i=0; i<nRecvMsgs; i++) LocalizeObjects(context, theMsgs[i], !TOTALNEW);
+ for(i=0; i<nRecvMsgs; i++) LocalizeObjects(context, theMsgs[i], true);
+ for(i=0; i<nRecvMsgs; i++) LocalizeObjects(context, theMsgs[i], false);
/*
at this point all new objects are established,
@@ -1642,12 +1642,12 @@ void XferUnpack (DDD::DDDContext& context, LC_MSGHANDLE *theMsgs, int nRecvMsgs,
CallUpdateHandler(context, theMsgs[i]);
/* for all incoming objects */
- for(i=0; i<nRecvMsgs; i++) UnpackAddData(context, theMsgs[i], TOTALNEW);
- for(i=0; i<nRecvMsgs; i++) UnpackAddData(context, theMsgs[i], !TOTALNEW);
+ for(i=0; i<nRecvMsgs; i++) UnpackAddData(context, theMsgs[i], true);
+ for(i=0; i<nRecvMsgs; i++) UnpackAddData(context, theMsgs[i], false);
/* for PARTNEW and TOTALNEW objects */
- for(i=0; i<nRecvMsgs; i++) CallObjMkConsHandler(context, theMsgs[i], TOTALNEW);
- for(i=0; i<nRecvMsgs; i++) CallObjMkConsHandler(context, theMsgs[i], !TOTALNEW);
+ for(i=0; i<nRecvMsgs; i++) CallObjMkConsHandler(context, theMsgs[i], true);
+ for(i=0; i<nRecvMsgs; i++) CallObjMkConsHandler(context, theMsgs[i], false);
diff --git a/parallel/dddif/debugger.cc b/parallel/dddif/debugger.cc
index 1667e5002a6b4e95a9c8eb001c9a1d86dc44e290..1e37051594515819d96fd74215e068618ace243d 100644
--- a/parallel/dddif/debugger.cc
+++ b/parallel/dddif/debugger.cc
@@ -361,7 +361,7 @@ static void buggy_Search (MULTIGRID *theMG, DDD_GID gid)
if (DDD_InfoGlobalId(PARHDRE(e))==gid)
{
printf("ELEMENT gid=" DDD_GID_FMT ", adr=%p, level=%d\n",
- gid, e, level);
+ gid, (void*) e, level);
buggy_ShowCopies(context, PARHDRE(e));
buggy_ElemShow(e);
found = true;
@@ -375,7 +375,7 @@ static void buggy_Search (MULTIGRID *theMG, DDD_GID gid)
if (DDD_InfoGlobalId(PARHDR(n))==gid)
{
printf("NODE gid=" DDD_GID_FMT ", adr=%p, level=%d\n",
- gid, n, level);
+ gid, (void*) n, level);
buggy_ShowCopies(context, PARHDR(n));
buggy_NodeShow(n);
found = true;
diff --git a/parallel/dddif/overlap.cc b/parallel/dddif/overlap.cc
index 1da32113a13e34aa6556c0d45a8f728b468e03e6..f82fdc861d7bb37664a9dd89653939ca4f83967e 100644
--- a/parallel/dddif/overlap.cc
+++ b/parallel/dddif/overlap.cc
@@ -730,7 +730,7 @@ static INT ConnectOverlapVerticalGrid (GRID *theGrid)
printf("ConnectOverlapVerticalGrid(): new "
" midnode relation between theEdge=%08p"
" SonNode=" ID_FMTX "Vertex=" VID_FMTX "\n",
- theEdge,ID_PRTX(SonNode),
+ (void*) theEdge,ID_PRTX(SonNode),
VID_PRTX(MYVERTEX(SonNode)));
ENDDEBUG
#endif