misc: remove #include <cassert> from misc.hh since not everyone needs it.

diff --git a/src/arch/alpha/miscregfile.cc b/src/arch/alpha/miscregfile.cc
index f119ca6bb4306f7a8f578c926f6b21f6e039d7a6..61a86f1fb7af261e66ef88200c4df5f7feaee670 100644 (file)
--- 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 d787f30e4f3116327ca23324df54c1040121acf8..ee4ca0c2c9d9d681a4697a0df4b7744b7be3bd2c 100644 (file)
--- 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 142e233dba802d954ba58a9368c1d5cfe18ab4f0..30ed80942933d4f282c65d8eeae6da350f99c351 100644 (file)
--- 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 6e41e8134fa4e0b703dcc44a6477fce30c1ada46..a16ce6fb8efc4a97800c29c62bb3b72836497a55 100644 (file)
--- 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 ad46a7de5e23d17eddaac6f1db1576eea6795166..f71c4456b18857a72440dab61dd464966974e3ec 100644 (file)
--- 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 6b0025c3464cf3ea0ee6696c4651880b8b9eccc6..8d38fa7312ccf45521d022021ef36b7737331449 100644 (file)
--- 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__