diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-03-12 16:27:52 -0500 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-03-12 16:27:52 -0500 |
commit | 159cee171976019badb17336eff5b69df3c89528 (patch) | |
tree | 186f575cc382dd832113b6934af0693d1a3ca4ab | |
parent | e1985e02007f2e34d6e62c66ba417e6e9f3a1316 (diff) | |
download | gem5-159cee171976019badb17336eff5b69df3c89528.tar.xz |
Clean up arch/*/process.hh includes and std namespace issues.
arch/alpha/process.cc:
arch/mips/process.cc:
arch/sparc/process.cc:
You really do need the headers in the .cc file.
arch/alpha/process.hh:
Don't include unnecessary headers in another header.
Replace with forward class declarations.
arch/mips/process.hh:
arch/sparc/process.hh:
Don't include unnecessary headers in another header.
Replace with forward class declarations.
Also fix std namespace... no "using" in header files!
--HG--
extra : convert_revision : f2cd953d0f4a212bb8148cc54c329aa3c18deb89
-rw-r--r-- | arch/alpha/process.cc | 4 | ||||
-rw-r--r-- | arch/alpha/process.hh | 11 | ||||
-rw-r--r-- | arch/mips/process.cc | 3 | ||||
-rw-r--r-- | arch/mips/process.hh | 14 | ||||
-rw-r--r-- | arch/sparc/process.cc | 3 | ||||
-rw-r--r-- | arch/sparc/process.hh | 14 |
6 files changed, 33 insertions, 16 deletions
diff --git a/arch/alpha/process.cc b/arch/alpha/process.cc index dc4b92861..17a54ee80 100644 --- a/arch/alpha/process.cc +++ b/arch/alpha/process.cc @@ -27,6 +27,10 @@ */ #include "arch/alpha/process.hh" +#include "arch/alpha/linux/process.hh" +#include "arch/alpha/tru64/process.hh" +#include "base/loader/object_file.hh" +#include "base/misc.hh" namespace AlphaISA { diff --git a/arch/alpha/process.hh b/arch/alpha/process.hh index a2eb65890..6d6585175 100644 --- a/arch/alpha/process.hh +++ b/arch/alpha/process.hh @@ -30,18 +30,19 @@ #define __ALPHA_PROCESS_HH__ #include <string> +#include <vector> -#include "arch/alpha/linux/process.hh" -#include "arch/alpha/tru64/process.hh" -#include "base/loader/object_file.hh" +class LiveProcess; +class ObjectFile; +class System; namespace AlphaISA { LiveProcess * createProcess(const std::string &nm, ObjectFile * objFile, System * system, - int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, std::vector<std::string> &envp); + int stdin_fd, int stdout_fd, int stderr_fd, + std::vector<std::string> &argv, std::vector<std::string> &envp); } // namespace AlphaISA diff --git a/arch/mips/process.cc b/arch/mips/process.cc index 7f374f580..f63e668b5 100644 --- a/arch/mips/process.cc +++ b/arch/mips/process.cc @@ -27,6 +27,9 @@ */ #include "arch/mips/process.hh" +#include "arch/mips/linux/process.hh" +#include "base/loader/object_file.hh" +#include "base/misc.hh" using namespace std; diff --git a/arch/mips/process.hh b/arch/mips/process.hh index b2a35d688..8f5d74d96 100644 --- a/arch/mips/process.hh +++ b/arch/mips/process.hh @@ -29,18 +29,20 @@ #ifndef __MIPS_PROCESS_HH__ #define __MIPS_PROCESS_HH__ -#include "arch/mips/linux_process.hh" -#include "base/loader/object_file.hh" +#include <string> +#include <vector> -using namespace std; +class LiveProcess; +class ObjectFile; +class System; namespace MipsISA { LiveProcess * -createProcess(const string &nm, ObjectFile * objFile,System * system, - int stdin_fd, int stdout_fd, int stderr_fd, - vector<string> &argv, vector<string> &envp); +createProcess(const std::string &nm, ObjectFile * objFile,System * system, + int stdin_fd, int stdout_fd, int stderr_fd, + std::vector<std::string> &argv, std::vector<std::string> &envp); } // namespace MipsISA diff --git a/arch/sparc/process.cc b/arch/sparc/process.cc index 53a215379..2c10f65e6 100644 --- a/arch/sparc/process.cc +++ b/arch/sparc/process.cc @@ -27,6 +27,9 @@ */ #include "arch/sparc/process.hh" +#include "arch/sparc/linux/process.hh" +#include "base/loader/object_file.hh" +#include "base/misc.hh" namespace SparcISA { diff --git a/arch/sparc/process.hh b/arch/sparc/process.hh index 48041a316..e0bba3497 100644 --- a/arch/sparc/process.hh +++ b/arch/sparc/process.hh @@ -29,16 +29,20 @@ #ifndef __SPARC_PROCESS_HH__ #define __SPARC_PROCESS_HH__ -#include "arch/sparc/linux/process.hh" -#include "base/loader/object_file.hh" +#include <string> +#include <vector> + +class LiveProcess; +class ObjectFile; +class System; namespace SparcISA { LiveProcess * -createProcess(const string &nm, ObjectFile * objFile, - int stdin_fd, int stdout_fd, int stderr_fd, - vector<string> &argv, vector<string> &envp); +createProcess(const std::string &nm, ObjectFile * objFile, + int stdin_fd, int stdout_fd, int stderr_fd, + std::vector<std::string> &argv, std::vector<std::string> &envp); } // namespace SparcISA |