changeset 05fd71ca96db in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=05fd71ca96db
description:
misc: remove #include <cassert> from misc.hh since not everyone needs
it.
diffstat:
5 files changed, 4 insertions(+), 2 deletions(-)
src/arch/alpha/miscregfile.cc | 1 +
src/arch/sparc/pagetable.hh | 1 +
src/arch/x86/emulenv.cc | 1 +
src/arch/x86/predecoder.hh | 1 +
src/base/misc.hh | 2 --
diffs (81 lines):
diff -r 0e1e9c186769 -r 05fd71ca96db src/arch/alpha/miscregfile.cc
--- a/src/arch/alpha/miscregfile.cc Thu Oct 09 22:19:39 2008 -0700
+++ b/src/arch/alpha/miscregfile.cc Fri Oct 10 10:15:00 2008 -0700
@@ -29,6 +29,8 @@
* Gabe Black
* Kevin Lim
*/
+
+#include <cassert>
#include "arch/alpha/miscregfile.hh"
#include "base/misc.hh"
diff -r 0e1e9c186769 -r 05fd71ca96db src/arch/sparc/pagetable.hh
--- a/src/arch/sparc/pagetable.hh Thu Oct 09 22:19:39 2008 -0700
+++ b/src/arch/sparc/pagetable.hh Fri Oct 10 10:15:00 2008 -0700
@@ -30,6 +30,8 @@
#ifndef __ARCH_SPARC_PAGETABLE_HH__
#define __ARCH_SPARC_PAGETABLE_HH__
+
+#include <cassert>
#include "arch/sparc/isa_traits.hh"
#include "base/bitfield.hh"
diff -r 0e1e9c186769 -r 05fd71ca96db src/arch/x86/emulenv.cc
--- a/src/arch/x86/emulenv.cc Thu Oct 09 22:19:39 2008 -0700
+++ b/src/arch/x86/emulenv.cc Fri Oct 10 10:15:00 2008 -0700
@@ -55,6 +55,8 @@
* Authors: Gabe Black
*/
+#include <cassert>
+
#include "arch/x86/emulenv.hh"
#include "base/misc.hh"
diff -r 0e1e9c186769 -r 05fd71ca96db src/arch/x86/predecoder.hh
--- a/src/arch/x86/predecoder.hh Thu Oct 09 22:19:39 2008 -0700
+++ b/src/arch/x86/predecoder.hh Fri Oct 10 10:15:00 2008 -0700
@@ -57,6 +57,8 @@
#ifndef __ARCH_X86_PREDECODER_HH__
#define __ARCH_X86_PREDECODER_HH__
+
+#include <cassert>
#include "arch/x86/types.hh"
#include "base/bitfield.hh"
diff -r 0e1e9c186769 -r 05fd71ca96db src/base/loader/elf_object.cc
--- a/src/base/loader/elf_object.cc Thu Oct 09 22:19:39 2008 -0700
+++ b/src/base/loader/elf_object.cc Fri Oct 10 10:15:00 2008 -0700
@@ -29,6 +29,7 @@
* Ali Saidi
*/
+#include <cassert>
#include <string>
#include "gelf.h"
diff -r 0e1e9c186769 -r 05fd71ca96db src/base/misc.hh
--- a/src/base/misc.hh Thu Oct 09 22:19:39 2008 -0700
+++ b/src/base/misc.hh Fri Oct 10 10:15:00 2008 -0700
@@ -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 @@
} \
} while (0)
-#endif // __MISC_HH__
+#endif // __BASE_MISC_HH__
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
