Merge pull request #1496 from jjhursey/topic/pmix120-obj-patch

jjhursey · jjhursey · commit 099170bb3115 · 2016-03-25T19:35:43.000-05:00
pmix/pmix120: Fix OBJ_ to PMIX_ symbol name
diff --git a/opal/mca/pmix/pmix120/pmix/src/client/pmix_client.c b/opal/mca/pmix/pmix120/pmix/src/client/pmix_client.c
@@ -1443,7 +1443,7 @@ static void dereg_errhandler(int sd, short args, void *cbdata)
     } else {
         cd->cbfunc.opcbfn(PMIX_ERR_NOT_FOUND, cd->cbdata);
     }
-    OBJ_RELEASE(cd);
+    PMIX_RELEASE(cd);
 }
 
 void pmix_client_deregister_errhandler(int errhandler_ref,
diff --git a/opal/mca/pmix/pmix120/pmix/src/server/pmix_server.c b/opal/mca/pmix/pmix120/pmix/src/server/pmix_server.c
@@ -1279,7 +1279,7 @@ static void dereg_errhandler(int sd, short args, void *cbdata)
     if (NULL != cd->cbfunc.opcbfn) {
         cd->cbfunc.opcbfn(rc, cd->cbdata);
     }
-    OBJ_RELEASE(cd);
+    PMIX_RELEASE(cd);
 }
 
 void pmix_server_deregister_errhandler(int errhandler_ref,

Original file line number	Diff line number	Diff line change
`@@ -1443,7 +1443,7 @@ static void dereg_errhandler(int sd, short args, void *cbdata)`
`1443`	`1443`	`} else {`
`1444`	`1444`	`cd->cbfunc.opcbfn(PMIX_ERR_NOT_FOUND, cd->cbdata);`
`1445`	`1445`	`}`
`1446`		`- OBJ_RELEASE(cd);`
	`1446`	`+ PMIX_RELEASE(cd);`
`1447`	`1447`	`}`
`1448`	`1448`
`1449`	`1449`	`void pmix_client_deregister_errhandler(int errhandler_ref,`
Original file line number	Diff line number	Diff line change
`@@ -1279,7 +1279,7 @@ static void dereg_errhandler(int sd, short args, void *cbdata)`
`1279`	`1279`	`if (NULL != cd->cbfunc.opcbfn) {`
`1280`	`1280`	`cd->cbfunc.opcbfn(rc, cd->cbdata);`
`1281`	`1281`	`}`
`1282`		`- OBJ_RELEASE(cd);`
	`1282`	`+ PMIX_RELEASE(cd);`
`1283`	`1283`	`}`
`1284`	`1284`
`1285`	`1285`	`void pmix_server_deregister_errhandler(int errhandler_ref,`