From 457dce57b24ae5ca72fe90173339c7f7a8630d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Mon, 4 Jun 2018 16:44:36 +0200 Subject: [PATCH] Some warnings eliminated. 9 warnings to go, all from external code (e.g., systemc lib). --- .../src/controller/scheduler/Fr_Fcfs_read_priority.cpp | 1 + DRAMSys/library/src/simulation/TracePlayer.cpp | 2 +- DRAMSys/traceAnalyzer/businessObjects/transaction.cpp | 5 +++-- DRAMSys/traceAnalyzer/businessObjects/transaction.h | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/DRAMSys/library/src/controller/scheduler/Fr_Fcfs_read_priority.cpp b/DRAMSys/library/src/controller/scheduler/Fr_Fcfs_read_priority.cpp index 66b1f260..57c2f60f 100644 --- a/DRAMSys/library/src/controller/scheduler/Fr_Fcfs_read_priority.cpp +++ b/DRAMSys/library/src/controller/scheduler/Fr_Fcfs_read_priority.cpp @@ -108,6 +108,7 @@ std::pair FR_FCFS_RP::getNextRequest(Bank bank) } reportFatal("FR_FCFS_RP", "Never should go here ..."); + return pair(Command::NOP, NULL); } // There is a hazard if a read is found which will be scheduled before a write diff --git a/DRAMSys/library/src/simulation/TracePlayer.cpp b/DRAMSys/library/src/simulation/TracePlayer.cpp index 9eeb56d1..581098a3 100644 --- a/DRAMSys/library/src/simulation/TracePlayer.cpp +++ b/DRAMSys/library/src/simulation/TracePlayer.cpp @@ -40,9 +40,9 @@ TracePlayer::TracePlayer(TracePlayerListener *listener) : payloadEventQueue(this, &TracePlayer::peqCallback), + numberOfTransactions(0), transactionsSent(0), transactionsReceived(0), - numberOfTransactions(0), listener(listener), finished(false) { diff --git a/DRAMSys/traceAnalyzer/businessObjects/transaction.cpp b/DRAMSys/traceAnalyzer/businessObjects/transaction.cpp index 8d1d72ab..9bdec5f5 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/transaction.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/transaction.cpp @@ -39,8 +39,9 @@ using namespace std; Transaction::Transaction(ID id, unsigned int address, unsigned int burstlength, - int thread, unsigned int channel, unsigned int bank, unsigned int bankgroup, - unsigned int row, unsigned int column, Timespan span, Timespan spanOnDataStrobe) + unsigned int thread, unsigned int channel, unsigned int bank, + unsigned int bankgroup, unsigned int row, unsigned int column, Timespan span, + Timespan spanOnDataStrobe) : address(address), burstlength(burstlength), thread(thread), channel(channel), bank(bank), bankgroup(bankgroup), row(row), column(column), span(span), spanOnDataStrobe(spanOnDataStrobe), id(id) {} diff --git a/DRAMSys/traceAnalyzer/businessObjects/transaction.h b/DRAMSys/traceAnalyzer/businessObjects/transaction.h index 2bfbe1a9..767c4f48 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/transaction.h +++ b/DRAMSys/traceAnalyzer/businessObjects/transaction.h @@ -56,9 +56,9 @@ private: std::vector> phases; public: - Transaction(ID id, unsigned int address, unsigned int burstlength, int thread, - unsigned int channel, unsigned int bank, unsigned int bankgroup, - unsigned int row, unsigned int column, Timespan span, + Transaction(ID id, unsigned int address, unsigned int burstlength, + unsigned int thread, unsigned int channel, unsigned int bank, + unsigned int bankgroup, unsigned int row, unsigned int column, Timespan span, Timespan spanOnDataStrobe); void draw(QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap, @@ -77,7 +77,7 @@ public: { return burstlength; } - int Thread() + unsigned int Thread() { return thread; }