scanalysis: fix warning

canalysis.cc: In member function ‘bool SCAnalysis::processRead(ModelAction*, ClockVector*)’:
scanalysis.cc:162:78: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]

diff --git a/scanalysis.cc b/scanalysis.cc
index 2bc275d7cada1f25fe4d3af3d1076f1c79325a4a..288aa498c72801f1326fa8c986bc3d77afbbca64 100644 (file)
--- 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);
        /* 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);
 
        for(int i=0;i<=maxthreads;i++) {
                thread_id_t tid=int_to_id(i);