From 590808df87305021cb195b072d4300150488d5a3 Mon Sep 17 00:00:00 2001 From: Martin Perner Date: Thu, 4 Nov 2010 12:50:36 +0100 Subject: [PATCH] sim: fix for mani's ubuntu gcc --- 3b_sim/cmem.hpp | 2 +- 3b_sim/cpmem.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3b_sim/cmem.hpp b/3b_sim/cmem.hpp index 8e348c7..09f4293 100644 --- a/3b_sim/cmem.hpp +++ b/3b_sim/cmem.hpp @@ -28,7 +28,7 @@ public: /* doesn't align, user has to do */ void setDirect(const MEMORY_ADDRESS address, const T data); T getDirect(const MEMORY_ADDRESS address) const; - CMem(int size) : MAX_MEMORY(size), m_memory(size) {}; + CMem(int size) : MAX_MEMORY(size), m_memory(size,(T)NULL) {}; }; #endif diff --git a/3b_sim/cpmem.hpp b/3b_sim/cpmem.hpp index 6b64a0e..698006a 100644 --- a/3b_sim/cpmem.hpp +++ b/3b_sim/cpmem.hpp @@ -32,7 +32,7 @@ public: //retuniert referenz eines cdat objekts mit dem Wert von address T get(const MEMORY_ADDRESS address) const; T getByte(const MEMORY_ADDRESS address) const; - CPMem(int size) : MAX_MEMORY(size), m_memory(size, NULL) {}; + CPMem(int size) : MAX_MEMORY(size), m_memory(size, (T)NULL) {}; ~CPMem(); }; -- 2.25.1