Tom Rollet has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/51347 )
Change subject: cpu-o3: remove useless 'using'-s
..
cpu-o3: remove useless 'using'-s
Change-Id: Ifa8ef516d0deabb4308bdf3c4b61b88ece149d0e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51347
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/cpu/o3/lsq.hh
1 file changed, 13 insertions(+), 69 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index c909f54..798ceb9 100644
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -562,34 +562,6 @@
class SingleDataRequest : public LSQRequest
{
- protected:
-/* Given that we are inside templates, children need explicit
- * declaration of the names in the parent class. */
-using Flag = LSQRequest::Flag;
-using State = LSQRequest::State;
-using LSQRequest::_addr;
-using LSQRequest::_fault;
-using LSQRequest::_flags;
-using LSQRequest::_size;
-using LSQRequest::_byteEnable;
-using LSQRequest::_reqs;
-using LSQRequest::_inst;
-using LSQRequest::_packets;
-using LSQRequest::_port;
-using LSQRequest::_res;
-using LSQRequest::_taskId;
-using LSQRequest::_state;
-using LSQRequest::flags;
-using LSQRequest::isLoad;
-using LSQRequest::isTranslationComplete;
-using LSQRequest::lsqUnit;
-using LSQRequest::req;
-using LSQRequest::sendFragmentToTranslation;
-using LSQRequest::setState;
-using LSQRequest::numInTranslationFragments;
-using LSQRequest::numTranslatedFragments;
-using LSQRequest::_numOutstandingPackets;
-using LSQRequest::_amo_op;
public:
SingleDataRequest(LSQUnit* port, const DynInstPtr& inst,
bool isLoad, const Addr& addr, const uint32_t& size,
@@ -616,19 +588,6 @@
// of encapsulating hardware transactional memory command requests
class HtmCmdRequest : public SingleDataRequest
{
- protected:
-/* Given that we are inside templates, children need explicit
- * declaration of the names in the parent class. */
-using Flag = LSQRequest::Flag;
-using State = LSQRequest::State;
-using LSQRequest::_addr;
-using LSQRequest::_size;
-using LSQRequest::_byteEnable;
-using LSQRequest::_reqs;
-using LSQRequest::_inst;
-using LSQRequest::_taskId;
-using LSQRequest::flags;
-using LSQRequest::setState;
public:
HtmCmdRequest(LSQUnit* port, const DynInstPtr& inst,
const Request::Flags& flags_);
@@ -642,34 +601,6 @@
class SplitDataRequest : public LSQRequest
{
protected:
-/* Given that we are inside templates, children need explicit
- * declaration of the names in the parent class. */
-using Flag = LSQRequest::Flag;
-using State = LSQRequest::State;
-using LSQRequest::_addr;
-using LSQRequest::_data;
-using LSQRequest::_fault;
-using LSQRequest::_flags;
-using LSQRequest::_inst;
-using LSQRequest::_packets;
-using LSQRequest::_port;
-using LSQRequest::_reqs;
-using LSQRequest::_res;
-using LSQRequest::_byteEnable;
-using LSQRequest::_size;
-using LSQRequest::_state;
-using LSQRequest::_taskId;
-using LSQRequest::flags;
-using LSQRequest::isLoad;
-using LSQRequest::isTranslationComplete;
-using LSQRequest::lsqUnit;
-using LSQRequest::numInTranslationFragments;
-using LSQRequest::numTranslatedFragments;
-using LSQRequest::req;
-using LSQRequest::sendFragmentToTranslation;
-using LSQRequest::setState;
-using LSQRequest::_numOutstandingPackets;
-
uint32_t numFragments;
uint32_t numReceivedPackets;
RequestPtr _mainReq;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51347
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ifa8ef516d0deabb4308bdf3c4b61b88ece149d0e
Gerrit-Change-Number: 51347
Gerrit-PatchSet: 2
Gerrit-Owner: Tom Rollet
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Tom Rollet
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
