diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-03-29 16:05:26 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-03-29 16:05:26 -0500 |
commit | d46d3d6811822d218c137cd6d991e6b4981811d6 (patch) | |
tree | b65fae51ce340e121286c08448152524b1be2c0a | |
parent | c5c76cea9871796820f1597f286dcfc21c85a180 (diff) | |
download | gem5-d46d3d6811822d218c137cd6d991e6b4981811d6.tar.xz |
Remove "using namespace std" from global declarations.
--HG--
extra : convert_revision : c580bc6bd308fd502fb5a14ea84b5214e1d2718e
-rw-r--r-- | arch/alpha/linux/system.hh | 1 | ||||
-rw-r--r-- | base/timebuf.hh | 4 | ||||
-rw-r--r-- | kern/tru64/tru64.hh | 13 |
3 files changed, 12 insertions, 6 deletions
diff --git a/arch/alpha/linux/system.hh b/arch/alpha/linux/system.hh index 035e2a427..0c1fb037e 100644 --- a/arch/alpha/linux/system.hh +++ b/arch/alpha/linux/system.hh @@ -39,7 +39,6 @@ class IdleStartEvent; using namespace AlphaISA; using namespace Linux; -using namespace std; /** * This class contains linux specific system code (Loading, Events, Binning). diff --git a/base/timebuf.hh b/base/timebuf.hh index 435803fae..f6b5b2781 100644 --- a/base/timebuf.hh +++ b/base/timebuf.hh @@ -31,8 +31,6 @@ #include <vector> -using namespace std; - template <class T> class TimeBuffer { @@ -42,7 +40,7 @@ class TimeBuffer int size; char *data; - vector<char *> index; + std::vector<char *> index; int base; void valid(int idx) diff --git a/kern/tru64/tru64.hh b/kern/tru64/tru64.hh index 3f5ef3dea..b4f45e650 100644 --- a/kern/tru64/tru64.hh +++ b/kern/tru64/tru64.hh @@ -55,8 +55,6 @@ class Tru64 {}; #include "sim/root.hh" #include "sim/syscall_emul.hh" -using namespace std; - typedef struct stat global_stat; typedef struct statfs global_statfs; typedef struct dirent global_dirent; @@ -751,6 +749,7 @@ class Tru64 { tableFunc(SyscallDesc *desc, int callnum, Process *process, ExecContext *xc) { + using namespace std; using namespace TheISA; int id = xc->getSyscallArg(0); // table ID @@ -824,6 +823,7 @@ class Tru64 { nxm_task_initFunc(SyscallDesc *desc, int callnum, Process *process, ExecContext *xc) { + using namespace std; using namespace TheISA; TypedBufferArg<Tru64::nxm_task_attr> attrp(xc->getSyscallArg(0)); @@ -957,6 +957,7 @@ class Tru64 { nxm_thread_createFunc(SyscallDesc *desc, int callnum, Process *process, ExecContext *xc) { + using namespace std; using namespace TheISA; TypedBufferArg<Tru64::nxm_thread_attr> attrp(xc->getSyscallArg(0)); @@ -1081,6 +1082,8 @@ class Tru64 { nxm_thread_blockFunc(SyscallDesc *desc, int callnum, Process *process, ExecContext *xc) { + using namespace std; + uint64_t tid = xc->getSyscallArg(0); uint64_t secs = xc->getSyscallArg(1); uint64_t flags = xc->getSyscallArg(2); @@ -1098,6 +1101,8 @@ class Tru64 { nxm_blockFunc(SyscallDesc *desc, int callnum, Process *process, ExecContext *xc) { + using namespace std; + Addr uaddr = xc->getSyscallArg(0); uint64_t val = xc->getSyscallArg(1); uint64_t secs = xc->getSyscallArg(2); @@ -1119,6 +1124,8 @@ class Tru64 { nxm_unblockFunc(SyscallDesc *desc, int callnum, Process *process, ExecContext *xc) { + using namespace std; + Addr uaddr = xc->getSyscallArg(0); cout << xc->getCpuPtr()->name() << ": nxm_unblock " @@ -1149,6 +1156,8 @@ class Tru64 { activate_waiting_context(Addr uaddr, Process *process, bool activate_all = false) { + using namespace std; + int num_activated = 0; list<Process::WaitRec>::iterator i = process->waitList.begin(); |