From: Ali Saidi <saidi@eecs.umich.edu>
Date: Sun, 13 Feb 2011 21:51:15 +0000 (-0500)
Subject: O3: Fix GCC 4.2.4 complaint
X-Git-Tag: stable_2012_02_02~553^2~2^2^2~14
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c763b34c9fc69a4e13a8f74df0f981fdf71f221;p=gem5.git

O3: Fix GCC 4.2.4 complaint
---

diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh
index d6da4b818..aa21a0edc 100644
--- a/src/cpu/o3/inst_queue_impl.hh
+++ b/src/cpu/o3/inst_queue_impl.hh
@@ -749,7 +749,7 @@ InstructionQueue<Impl>::scheduleReadyInsts()
     DynInstPtr deferred_mem_inst;
     int total_deferred_mem_issued = 0;
     while (total_deferred_mem_issued < totalWidth &&
-           (deferred_mem_inst = getDeferredMemInstToExecute()) != NULL) {
+           (deferred_mem_inst = getDeferredMemInstToExecute()) != 0) {
         issueToExecuteQueue->access(0)->size++;
         instsToExecute.push_back(deferred_mem_inst);
         total_deferred_mem_issued++;