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 5aa14a118eb380359d1676feff70b26d29c1d52e..1ab3b989d96dfd15486fd5327ef29a9c22c3e02d 100644 (file)
--- 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 44521a5426446a60284326e7aa1a3ca6662d27ef..6e87647097f9d8cc7ce19561b70630d31eac456a 100644 (file)
--- 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)