Get rid of 'using namespace' declarations in headers.

diff --git a/src/arch/alpha/linux/system.hh b/src/arch/alpha/linux/system.hh
index fa03736c34b4ae28bfa80c43002d98ed20b93300..3e4de7b2a2e33e313760269d91897bc246a1d6c7 100644 (file)
--- a/src/arch/alpha/linux/system.hh
+++ b/src/arch/alpha/linux/system.hh
@@ -43,9 +43,6 @@ class IdleStartEvent;
 #include "kern/linux/events.hh"
 #include "params/LinuxAlphaSystem.hh"
 
-using namespace AlphaISA;
-using namespace Linux;
-
 /**
  * This class contains linux specific system code (Loading, Events).
  * It points to objects that are the system binaries to load and patches them
@@ -109,7 +106,7 @@ class LinuxAlphaSystem : public AlphaSystem
      * PC based event to skip the dprink() call and emulate its
      * functionality
      */
-    DebugPrintkEvent *debugPrintkEvent;
+    Linux::DebugPrintkEvent *debugPrintkEvent;
 
     /**
      * Skip calculate_delay_loop() rather than waiting for this to be

diff --git a/src/arch/mips/bare_iron/system.hh b/src/arch/mips/bare_iron/system.hh
index ab4e02344a38a7020254da8f5d5a541c14274bed..e593f832ca0959f06f8f2e71156c0a83d6d9b995 100755 (executable)
--- a/src/arch/mips/bare_iron/system.hh
+++ b/src/arch/mips/bare_iron/system.hh
@@ -39,8 +39,6 @@ class IdleStartEvent;
 #include "arch/mips/system.hh"
 #include "params/BareIronMipsSystem.hh"
 
-using namespace MipsISA;
-
 /**
  * This class contains linux specific system code (Loading, Events).
  * It points to objects that are the system binaries to load and patches them

diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh
index ed4ed9877f436e9f19f9860ea72922a2b6ebbbea..12c887132900b1e89f0e9758c6f208a8c58efb88 100644 (file)
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/isa_traits.hh
@@ -381,6 +381,4 @@ namespace MipsISA
 
 };
 
-using namespace MipsISA;
-
 #endif // __ARCH_MIPS_ISA_TRAITS_HH__

diff --git a/src/arch/mips/linux/linux.hh b/src/arch/mips/linux/linux.hh
index 4667748fb1369a0cb2b20a5c1242f4e457d4b7be..aaeba0a42c04c65ef39aa5bcae23f5b60888a857 100644 (file)
--- a/src/arch/mips/linux/linux.hh
+++ b/src/arch/mips/linux/linux.hh
@@ -32,9 +32,6 @@
 #define __ARCH_MIPS_LINUX_LINUX_HH__
 
 #include "kern/linux/linux.hh"
-#include <string>
-
-using std::string;
 
 class MipsLinux : public Linux
 {

diff --git a/src/arch/mips/linux/system.hh b/src/arch/mips/linux/system.hh
index 24fb604ed59ff92829a7b8bbcffd6c4120d67f0a..984f7469453a2b49e28558b6c7cbb68a2a883307 100644 (file)
--- a/src/arch/mips/linux/system.hh
+++ b/src/arch/mips/linux/system.hh
@@ -43,9 +43,6 @@ class IdleStartEvent;
 #include "kern/linux/events.hh"
 #include "params/LinuxMipsSystem.hh"
 
-using namespace MipsISA;
-using namespace Linux;
-
 /**
  * This class contains linux specific system code (Loading, Events).
  * It points to objects that are the system binaries to load and patches them
@@ -112,7 +109,7 @@ class LinuxMipsSystem : public MipsSystem
      * PC based event to skip the dprink() call and emulate its
      * functionality
      */
-    DebugPrintkEvent *debugPrintkEvent;
+    Linux::DebugPrintkEvent *debugPrintkEvent;
 
     /**
      * Skip calculate_delay_loop() rather than waiting for this to be

diff --git a/src/arch/mips/mt.hh b/src/arch/mips/mt.hh
index 8828a09a5822184f8733b5c0da6ddbec52f4cefb..d0c333d8659989ea0cd57eb06f569e023cd3e34d 100755 (executable)
--- a/src/arch/mips/mt.hh
+++ b/src/arch/mips/mt.hh
@@ -45,7 +45,6 @@
 #include "base/misc.hh"
 
 #include <iostream>
-using namespace std;
 
 namespace MipsISA
 {
@@ -164,7 +163,7 @@ forkThread(TC *tc, Fault &fault, int Rd_bits, int Rs, int Rt)
                 success = 1;
             }
         } else {
-            std::cerr << "Bad VPEs" << endl;
+            std::cerr << "Bad VPEs" << std::endl;
         }
     }
 

diff --git a/src/arch/mips/regfile/misc_regfile.cc b/src/arch/mips/regfile/misc_regfile.cc
index ea858abf0ed56ff8c8a58ddc998837e8087adb17..a00bf166ed56a699c1985758d8087f98b5b7bfeb 100644 (file)
--- a/src/arch/mips/regfile/misc_regfile.cc
+++ b/src/arch/mips/regfile/misc_regfile.cc
@@ -43,6 +43,7 @@
 //#include "params/DerivO3CPU.hh"
 
 using namespace std;
+using namespace MipsISA;
 
 std::string MiscRegFile::miscRegNames[NumMiscRegs] =
 {

diff --git a/src/cpu/inorder/resources/fetch_seq_unit.hh b/src/cpu/inorder/resources/fetch_seq_unit.hh
index 2b074bbaa9109027ccc6b786ffe765ab8cdac61b..1885d1f11ac2fb0b217629ef3c26c2a3f43c3eea 100644 (file)
--- a/src/cpu/inorder/resources/fetch_seq_unit.hh
+++ b/src/cpu/inorder/resources/fetch_seq_unit.hh
@@ -41,8 +41,6 @@
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/cpu.hh"
 
-using namespace ThePipeline;
-
 class FetchSeqUnit : public Resource {
   public:
     typedef ThePipeline::DynInstPtr DynInstPtr;