From fc4118c3dcd9d565a1b6dd807670558f24b44cd8 Mon Sep 17 00:00:00 2001
From: Derek Christ <dchrist@rhrk.uni-kl.de>
Date: Fri, 13 Aug 2021 10:50:49 +0200
Subject: [PATCH] Fix merge conflicts

---
 .../traceAnalyzer/businessObjects/phases/phase.cpp   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp
index 98fa9e11..c99e1788 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp
@@ -184,18 +184,18 @@ std::vector<std::shared_ptr<TracePlotLine>> Phase::getTracePlotLines(const Trace
 {
     if (getGranularity() == Granularity::Rankwise)
     {
-        return drawingProperties.getBankLinesFromRank(transaction->rank);
+        return drawingProperties.getBankLinesFromRank(transaction.lock()->rank);
     }
     else if (getGranularity() == Granularity::Groupwise)
     {
-        return drawingProperties.getBankLinesGroupwise(transaction->rank,
-                                                       transaction->bank % drawingProperties.banksPerGroup);
+        return drawingProperties.getBankLinesGroupwise(transaction.lock()->rank,
+                                                       transaction.lock()->bank % drawingProperties.banksPerGroup);
     }
     else // if (getGranularity() == Granularity::Bankwise)
     {
-        return drawingProperties.getBankLines(transaction->rank,
-                                              transaction->bankgroup % drawingProperties.groupsPerRank,
-                                              transaction->bank
+        return drawingProperties.getBankLines(transaction.lock()->rank,
+                                              transaction.lock()->bankgroup % drawingProperties.groupsPerRank,
+                                              transaction.lock()->bank
                                               % drawingProperties.banksPerRank
                                               % drawingProperties.banksPerGroup);
     }