From 0280382ec0dcdd9290a14cb566dc43d4d41ecedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= <zulian@eit.uni-kl.de>
Date: Wed, 6 Jul 2016 10:22:03 +0200
Subject: [PATCH] Removal of template parameters after merge

---
 DRAMSys/simulator/src/simulation/Simulation.cpp     | 2 +-
 DRAMSys/simulator/src/simulation/Simulation.h       | 2 +-
 DRAMSys/simulator/src/simulation/exampleinitiator.h | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/DRAMSys/simulator/src/simulation/Simulation.cpp b/DRAMSys/simulator/src/simulation/Simulation.cpp
index 7dec81dc..e877cde5 100644
--- a/DRAMSys/simulator/src/simulation/Simulation.cpp
+++ b/DRAMSys/simulator/src/simulation/Simulation.cpp
@@ -148,7 +148,7 @@ void Simulation::instantiateModules(const string &traceName, const string &pathT
     arbiter = new Arbiter("arbiter");
     arbiter->setTlmRecorders(tlmRecorders);
 
-    init = new ExampleInitiator<>("init");
+    init = new ExampleInitiator("init");
 
     for (size_t i = 0; i < Configuration::getInstance().NumberOfMemChannels; i++) {
         std::string str = "controller" + std::to_string(i);
diff --git a/DRAMSys/simulator/src/simulation/Simulation.h b/DRAMSys/simulator/src/simulation/Simulation.h
index df26e78c..eb3a1b78 100644
--- a/DRAMSys/simulator/src/simulation/Simulation.h
+++ b/DRAMSys/simulator/src/simulation/Simulation.h
@@ -99,7 +99,7 @@ private:
     // and initiate transactions targeting the memory)
     std::vector<TracePlayer*> players;
     // All transactions pass through the same arbiter
-    ExampleInitiator<> *init;
+    ExampleInitiator *init;
     Arbiter *arbiter;
     // Each DRAM unit has a controller
     std::vector<Controller*> controllers;
diff --git a/DRAMSys/simulator/src/simulation/exampleinitiator.h b/DRAMSys/simulator/src/simulation/exampleinitiator.h
index 568cdf81..0c34d28f 100644
--- a/DRAMSys/simulator/src/simulation/exampleinitiator.h
+++ b/DRAMSys/simulator/src/simulation/exampleinitiator.h
@@ -10,11 +10,10 @@
 
 using namespace std;
 
-template<unsigned int BUSWIDTH = 128>
 struct ExampleInitiator: sc_module
 {
     // TLM-2 socket, defaults to 32-bits wide, base protocol
-    tlm_utils::simple_initiator_socket<ExampleInitiator, BUSWIDTH> socket;
+    tlm_utils::simple_initiator_socket<ExampleInitiator> socket;
 
     SC_CTOR(ExampleInitiator)
             : socket("socket")  // Construct and name socket