From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sun, 12 Mar 2006 20:14:07 +0000 (-0500)
Subject: Clean up "using" declarations.
X-Git-Tag: m5_2.0_beta1~183
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=71c2c962dbaf4e04d64a117b5b333a3c039423ad;p=gem5.git

Clean up "using" declarations.

arch/alpha/isa_traits.hh:
    No unprotected "using" in header files.
cpu/simple/cpu.cc:
    Fix ISA namespace "using" statement.

--HG--
extra : convert_revision : 317ea40f8de00748d7613a0116edab05770bdc72
---

diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 5aa14a118..1ab3b989d 100644
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -30,7 +30,6 @@
 #define __ARCH_ALPHA_ISA_TRAITS_HH__
 
 namespace LittleEndianGuest {}
-using namespace LittleEndianGuest;
 
 #include "arch/alpha/types.hh"
 #include "arch/alpha/constants.hh"
@@ -79,6 +78,8 @@ class SyscallReturn {
 namespace AlphaISA
 {
 
+using namespace LittleEndianGuest;
+
 // redirected register map, really only used for the full system case.
 extern const int reg_redir[NumIntRegs];
 
@@ -109,6 +110,4 @@ extern const int reg_redir[NumIntRegs];
 #endif
 };
 
-using namespace AlphaISA;
-
 #endif // __ARCH_ALPHA_ISA_TRAITS_HH__
diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc
index 44521a542..6e8764709 100644
--- a/cpu/simple/cpu.cc
+++ b/cpu/simple/cpu.cc
@@ -75,11 +75,7 @@
 #endif // FULL_SYSTEM
 
 using namespace std;
-
-//The SimpleCPU does alpha only
-//Change this to include arch/isa_traits.hh?
-//using namespace AlphaISA;
-#include "arch/isa_traits.hh"
+using namespace TheISA;
 
 SimpleCPU::TickEvent::TickEvent(SimpleCPU *c, int w)
     : Event(&mainEventQueue, CPU_Tick_Pri), cpu(c), width(w)