Commit c2c93382 authored by David Goodell's avatar David Goodell
Browse files

[svn-r6979] fix '||' --> '&&' in #if

No reviewer.
parent da733c6d
...@@ -376,7 +376,7 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) ...@@ -376,7 +376,7 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking)
{ {
/* MT FIXME-N1 race under per-object, harmless to disable here but /* MT FIXME-N1 race under per-object, harmless to disable here but
* its a symptom of a bigger problem... */ * its a symptom of a bigger problem... */
#if !(defined(MPICH_IS_THREADED) || (MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_PER_OBJECT)) #if !(defined(MPICH_IS_THREADED) && (MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_PER_OBJECT))
MPIU_Assert(MPIDI_Request_get_type(sreq) != MPIDI_REQUEST_TYPE_GET_RESP); MPIU_Assert(MPIDI_Request_get_type(sreq) != MPIDI_REQUEST_TYPE_GET_RESP);
#endif #endif
...@@ -673,7 +673,7 @@ int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, MPIDI_msg_sz_t buflen) ...@@ -673,7 +673,7 @@ int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, MPIDI_msg_sz_t buflen)
if (!reqFn) if (!reqFn)
{ {
/* MT FIXME-N1 */ /* MT FIXME-N1 */
#if !(defined(MPICH_IS_THREADED) || (MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_PER_OBJECT)) #if !(defined(MPICH_IS_THREADED) && (MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_PER_OBJECT))
MPIU_Assert(MPIDI_Request_get_type(rreq) != MPIDI_REQUEST_TYPE_GET_RESP); MPIU_Assert(MPIDI_Request_get_type(rreq) != MPIDI_REQUEST_TYPE_GET_RESP);
#endif #endif
MPIDI_CH3U_Request_complete(rreq); MPIDI_CH3U_Request_complete(rreq);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment