summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-08-15 17:41:22 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-08-15 17:41:22 -0400
commited58f77c473cf6f35a17ba1448a12dbca089987d (patch)
tree00b9ecfc881086d1ceaa5e62073b1bb979fa6837 /src/base
parent07488510713a1df61f6cefced7677047cfc0ef66 (diff)
downloadgem5-ed58f77c473cf6f35a17ba1448a12dbca089987d.tar.xz
fixes for gcc 4.1
Nate needs to fix sinic builder stuff Gabe needs to verify my fixes to decoder.isa OPT/DEBUG compiles for ALPHA_FS, ALPHA_SE, MIPS_SE, SPARC_SE with this changeset README: Fix the swig version in the readme src/SConscript: remove sinic until nate fixes the builder crap for it src/arch/alpha/system.hh: src/arch/mips/isa/includes.isa: src/arch/sparc/isa/decoder.isa: src/base/stats/visit.cc: src/base/timebuf.hh: src/dev/ide_disk.cc: src/dev/sinic.cc: src/mem/cache/miss/mshr.cc: src/mem/cache/miss/mshr_queue.cc: src/mem/packet.hh: src/mem/request.hh: src/sim/builder.hh: src/sim/system.hh: fixes for gcc 4.1 --HG-- extra : convert_revision : 3775427c0047b282574d4831dd602c96cac3ba17
Diffstat (limited to 'src/base')
-rw-r--r--src/base/stats/visit.cc2
-rw-r--r--src/base/timebuf.hh1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/base/stats/visit.cc b/src/base/stats/visit.cc
index 870e4fb77..6680eaa09 100644
--- a/src/base/stats/visit.cc
+++ b/src/base/stats/visit.cc
@@ -31,7 +31,6 @@
#include "base/stats/visit.hh"
namespace Stats {
-namespace Detail {
Visit::Visit()
{}
@@ -39,5 +38,4 @@ Visit::Visit()
Visit::~Visit()
{}
-/* namespace Detail */ }
/* namespace Stats */ }
diff --git a/src/base/timebuf.hh b/src/base/timebuf.hh
index a484a3179..1d0de8278 100644
--- a/src/base/timebuf.hh
+++ b/src/base/timebuf.hh
@@ -32,6 +32,7 @@
#ifndef __BASE_TIMEBUF_HH__
#define __BASE_TIMEBUF_HH__
+#include <cassert>
#include <vector>
template <class T>