When nesting if statements, use braces to avoid ambiguous else clauses.

diff --git a/src/arch/sparc/tlb_map.hh b/src/arch/sparc/tlb_map.hh
index 8285db939457e033fb3e1ad39a8a453bbdced795..fa49584ba5ec41aac8627717b911e50751fe0885 100644 (file)
--- a/src/arch/sparc/tlb_map.hh
+++ b/src/arch/sparc/tlb_map.hh
@@ -52,7 +52,7 @@ class TlbMap
 
         i = tree.upper_bound(r);
 
-        if (i == tree.begin())
+        if (i == tree.begin()) {
             if (r.real == i->first.real &&
                 r.partitionId == i->first.partitionId &&
                 i->first.va < r.va + r.size &&
@@ -62,6 +62,7 @@ class TlbMap
             else
                 // Nothing could match, so return end()
                 return tree.end();
+        }
 
         i--;
 

diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc
index c09cacc00c78e9247539253b5715951923ea36b7..2e668ec3279169e26598761e70f31e646a766a10 100644 (file)
--- a/src/mem/bridge.cc
+++ b/src/mem/bridge.cc
@@ -130,7 +130,7 @@ Bridge::BridgePort::recvTiming(PacketPtr pkt)
         return true;
     }
 
-    if (pkt->needsResponse())
+    if (pkt->needsResponse()) {
         if (respQueueFull()) {
             DPRINTF(BusBridge, "Local queue full, no space for response, nacking\n");
             DPRINTF(BusBridge, "queue size: %d outreq: %d outstanding resp: %d\n",
@@ -141,6 +141,7 @@ Bridge::BridgePort::recvTiming(PacketPtr pkt)
             DPRINTF(BusBridge, "Request Needs response, reserving space\n");
             ++outstandingResponses;
         }
+    }
 
     otherPort->queueForSendTiming(pkt);