changeset 091062b018b7 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=091062b018b7
description:
compile: don't #include unnecessary stuff
Time from base/time.hh has a name clash with Time from Ruby's
TypeDefines.hh. Eventually Ruby's Time should go away, so instead of
fixing this properly just try to avoid the clash.
diffstat:
src/base/stats/visit.hh | 5 -----
src/sim/syscall_emul.hh | 6 ++++--
2 files changed, 4 insertions(+), 7 deletions(-)
diffs (37 lines):
diff -r e46d048f7e69 -r 091062b018b7 src/base/stats/visit.hh
--- a/src/base/stats/visit.hh Mon May 03 00:45:01 2010 -0700
+++ b/src/base/stats/visit.hh Thu May 06 08:42:18 2010 -0700
@@ -31,11 +31,6 @@
#ifndef __BASE_STATS_VISIT_HH__
#define __BASE_STATS_VISIT_HH__
-#include <string>
-
-#include "base/time.hh"
-#include "base/types.hh"
-
namespace Stats {
class Info;
diff -r e46d048f7e69 -r 091062b018b7 src/sim/syscall_emul.hh
--- a/src/sim/syscall_emul.hh Mon May 03 00:45:01 2010 -0700
+++ b/src/sim/syscall_emul.hh Thu May 06 08:42:18 2010 -0700
@@ -41,14 +41,16 @@
/// This file defines objects used to emulate syscalls from the target
/// application on the host machine.
-#include <errno.h>
-#include <string>
#ifdef __CYGWIN32__
#include <sys/fcntl.h> // for O_BINARY
#endif
#include <sys/stat.h>
+#include <errno.h>
#include <fcntl.h>
#include <sys/uio.h>
+#include <sys/time.h>
+
+#include <string>
#include "base/chunk_generator.hh"
#include "base/intmath.hh" // for RoundUp
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
