From 10dbb93b23ef00daaa60bccc5f25764cda298a61 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Sun, 14 Apr 2013 21:34:49 -0700 Subject: [PATCH] scanalysis: fix warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit canalysis.cc: In member function ‘bool SCAnalysis::processRead(ModelAction*, ClockVector*)’: scanalysis.cc:162:78: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses] --- scanalysis.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanalysis.cc b/scanalysis.cc index 2bc275d..288aa49 100644 --- a/scanalysis.cc +++ b/scanalysis.cc @@ -159,7 +159,7 @@ bool SCAnalysis::processRead(ModelAction *read, ClockVector *cv) { /* Merge in the clock vector from the write */ const ModelAction *write=read->get_reads_from(); ClockVector *writecv=cvmap->get(write); - changed|= ( writecv == NULL || merge(cv, read, writecv) && (*read < *write)); + changed |= writecv == NULL || (merge(cv, read, writecv) && (*read < *write)); for(int i=0;i<=maxthreads;i++) { thread_id_t tid=int_to_id(i); -- 2.34.1