Gabe Black has submitted this change and it was merged. ( https://gem5-review.googlesource.com/c/public/gem5/+/15455 )

Change subject: systemc: Fix a function which was broken during style fixes.
......................................................................

systemc: Fix a function which was broken during style fixes.

Some brackets were misapplied while correcting the style of the TLM
header files.

Change-Id: I4e26d0316ca2545a5f26ad5fef0e986e42a1895b
Reviewed-on: https://gem5-review.googlesource.com/c/15455
Reviewed-by: Anthony Gutierrez <anthony.gutier...@amd.com>
Maintainer: Anthony Gutierrez <anthony.gutier...@amd.com>
---
M src/systemc/ext/tlm_utils/multi_passthrough_initiator_socket.h
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Anthony Gutierrez: Looks good to me, approved; Looks good to me, approved



diff --git a/src/systemc/ext/tlm_utils/multi_passthrough_initiator_socket.h b/src/systemc/ext/tlm_utils/multi_passthrough_initiator_socket.h
index d9b6d6f..30ae88d 100644
--- a/src/systemc/ext/tlm_utils/multi_passthrough_initiator_socket.h
+++ b/src/systemc/ext/tlm_utils/multi_passthrough_initiator_socket.h
@@ -141,10 +141,10 @@
         if (!m_beoe_disabled) { // We are not bound hierarchically.
             // So we bind the dummy to avoid a SystemC error.
             base_type::m_export.bind(m_dummy);
-            // and then return our own export so that the hierarchical
-            // binding is set up properly.
-            return base_type::get_base_export();
         }
+        // and then return our own export so that the hierarchical
+        // binding is set up properly.
+        return base_type::get_base_export();
     }

     virtual const sc_core::sc_export<tlm::tlm_bw_transport_if<TYPES>> &

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15455
To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I4e26d0316ca2545a5f26ad5fef0e986e42a1895b
Gerrit-Change-Number: 15455
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Anthony Gutierrez <anthony.gutier...@amd.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Matthias Jung <jun...@eit.uni-kl.de>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to