Merge pull request #7456 from EOSIO/fix_timer_assign_16x

fix assignment during timer creation - 1.6
EOSIO · Jun 4, 2019 · ca8cc91 · ca8cc91
2 parents 895e47a + 9b0e8fc
commit ca8cc91
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
@@ -124,7 +124,8 @@ namespace bacc = boost::accumulators;
       else {
          struct itimerval enable = {{0, 0}, {0, (int)x.count()-deadline_timer_verification.timer_overhead}};
          expired = 0;
-         expired |= !!setitimer(ITIMER_REAL, &enable, NULL);
+         if(setitimer(ITIMER_REAL, &enable, NULL))
+            expired = 1;
       }
    }