summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2008-10-10 10:15:00 -0700
committerNathan Binkert <nate@binkert.org>2008-10-10 10:15:00 -0700
commit5586b1539baf6dd9029473a4ec1596a9fc8b7765 (patch)
tree9c979471aa7c852c6d819431ae53536364008497
parent94b08bed07d13106381a0bb692bf0d879c5353d4 (diff)
downloadgem5-5586b1539baf6dd9029473a4ec1596a9fc8b7765.tar.xz
misc: remove #include <cassert> from misc.hh since not everyone needs it.
-rw-r--r--src/arch/alpha/miscregfile.cc2
-rw-r--r--src/arch/sparc/pagetable.hh2
-rw-r--r--src/arch/x86/emulenv.cc2
-rw-r--r--src/arch/x86/predecoder.hh2
-rw-r--r--src/base/loader/elf_object.cc1
-rw-r--r--src/base/misc.hh8
6 files changed, 12 insertions, 5 deletions
diff --git a/src/arch/alpha/miscregfile.cc b/src/arch/alpha/miscregfile.cc
index f119ca6bb..61a86f1fb 100644
--- a/src/arch/alpha/miscregfile.cc
+++ b/src/arch/alpha/miscregfile.cc
@@ -30,6 +30,8 @@
* Kevin Lim
*/
+#include <cassert>
+
#include "arch/alpha/miscregfile.hh"
#include "base/misc.hh"
diff --git a/src/arch/sparc/pagetable.hh b/src/arch/sparc/pagetable.hh
index d787f30e4..ee4ca0c2c 100644
--- a/src/arch/sparc/pagetable.hh
+++ b/src/arch/sparc/pagetable.hh
@@ -31,6 +31,8 @@
#ifndef __ARCH_SPARC_PAGETABLE_HH__
#define __ARCH_SPARC_PAGETABLE_HH__
+#include <cassert>
+
#include "arch/sparc/isa_traits.hh"
#include "base/bitfield.hh"
#include "base/misc.hh"
diff --git a/src/arch/x86/emulenv.cc b/src/arch/x86/emulenv.cc
index 142e233db..30ed80942 100644
--- a/src/arch/x86/emulenv.cc
+++ b/src/arch/x86/emulenv.cc
@@ -55,6 +55,8 @@
* Authors: Gabe Black
*/
+#include <cassert>
+
#include "arch/x86/emulenv.hh"
#include "base/misc.hh"
diff --git a/src/arch/x86/predecoder.hh b/src/arch/x86/predecoder.hh
index 6e41e8134..a16ce6fb8 100644
--- a/src/arch/x86/predecoder.hh
+++ b/src/arch/x86/predecoder.hh
@@ -58,6 +58,8 @@
#ifndef __ARCH_X86_PREDECODER_HH__
#define __ARCH_X86_PREDECODER_HH__
+#include <cassert>
+
#include "arch/x86/types.hh"
#include "base/bitfield.hh"
#include "base/misc.hh"
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index ad46a7de5..f71c4456b 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -29,6 +29,7 @@
* Ali Saidi
*/
+#include <cassert>
#include <string>
#include "gelf.h"
diff --git a/src/base/misc.hh b/src/base/misc.hh
index 6b0025c34..8d38fa731 100644
--- a/src/base/misc.hh
+++ b/src/base/misc.hh
@@ -29,10 +29,8 @@
* Dave Greene
*/
-#ifndef __MISC_HH__
-#define __MISC_HH__
-
-#include <cassert>
+#ifndef __BASE_MISC_HH__
+#define __BASE_MISC_HH__
#include "base/compiler.hh"
#include "base/cprintf.hh"
@@ -113,4 +111,4 @@ __warn(const char *func, const char *file, int line, const std::string &format,
} \
} while (0)
-#endif // __MISC_HH__
+#endif // __BASE_MISC_HH__